comparison: .gitconfig
.gitconfig
- changeset 916
- fed7d34cdfff
- parent 891
- 7947270fa776
- child 918
- 09aadfdbc7dd
equal
deleted
inserted
replaced
| 915:55a1c83b3417 | 916:fed7d34cdfff |
|---|---|
| 19 brd = diff @{u}.. | 19 brd = diff @{u}.. |
| 20 brf = diff --name-only @{u}.. | 20 brf = diff --name-only @{u}.. |
| 21 staged = diff --cached | 21 staged = diff --cached |
| 22 unstage = reset HEAD -- | 22 unstage = reset HEAD -- |
| 23 rollback = reset --soft ^HEAD | 23 rollback = reset --soft ^HEAD |
| 24 pushF = push --force-with-lease | 24 pushf = push --force-with-lease |
| 25 up = pull -r --prune | 25 up = pull -r --prune |
| 26 update = "!git remote update -p && git merge --ff-only --stat @{u}" | 26 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
| 27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" | 27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
| 28 out = "!git log --pretty=onelinecustom @{u}.." | 28 out = "!git log --pretty=onelinecustom @{u}.." |
| 29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" | 29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
| 30 glog = log --graph --pretty=onelinecustom | 30 glog = log --graph --pretty=onelinecustom |
| 31 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" | 31 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" |
| 32 orphan = "!f() { git fsck --dangling | grep commit | cut -d' ' -f3 | xargs git show --compact-summary; }; f" | |
| 32 | 33 |
| 33 [pretty] | 34 [pretty] |
| 34 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset | 35 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset |
| 35 | 36 |
| 36 [ui] | 37 [ui] |
| 66 | 67 |
| 67 [rerere] | 68 [rerere] |
| 68 autoupdate = true | 69 autoupdate = true |
| 69 | 70 |
| 70 [transfer] | 71 [transfer] |
| 71 fsckobjects = true | 72 fsckobjects = true |
| 72 | 73 |
| 73 # include.path is available in git 1.7.10 and later | 74 # include.path is available in git 1.7.10 and later |
| 74 [include] | 75 [include] |
| 75 path = ~/.gitconfig.local | 76 path = ~/.gitconfig.local |
| 76 | 77 |
| 77 # vim: noet:sw=8 | 78 # vim: noet:ts=8:sw=8 |
