comparison: .gitconfig
.gitconfig
- changeset 997
- 9e1ec7624f59
- parent 973
- 20158142fa43
- child 1028
- 77e65ab97892
equal
deleted
inserted
replaced
| 996:5563c242fe04 | 997:9e1ec7624f59 |
|---|---|
| 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 histedit = rebase -i --autosquash --onto @{u}... @{u} | 24 histedit = rebase -i --autosquash --onto @{u}... @{u} |
| 25 pushf = push --force-with-lease | 25 pushf = push --force-with-lease |
| 26 up = pull -r --prune | 26 up = pull |
| 27 update = "!git remote update -p && git merge --ff-only --stat @{u}" | 27 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
| 28 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" | 28 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
| 29 out = "!git log --pretty=onelinecustom @{u}.." | 29 out = "!git log --pretty=onelinecustom @{u}.." |
| 30 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" | 30 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
| 31 glog = log --graph --pretty=onelinecustom | 31 glog = log --graph --pretty=onelinecustom |
| 49 tool = vimdiff3 | 49 tool = vimdiff3 |
| 50 guitool = gvimdiff | 50 guitool = gvimdiff |
| 51 conflictstyle = diff3 | 51 conflictstyle = diff3 |
| 52 | 52 |
| 53 [branch] | 53 [branch] |
| 54 autosetuprebase = always | |
| 55 autosetupmerge = always | 54 autosetupmerge = always |
| 56 | 55 |
| 57 [commit] | 56 [commit] |
| 58 verbose = true | 57 verbose = true |
| 59 gpgsign = true | 58 gpgsign = true |
| 60 | 59 |
| 61 [diff] | 60 [diff] |
| 62 compactionheuristic = true | 61 compactionheuristic = true |
| 63 | 62 |
| 63 [pull] | |
| 64 rebase = true | |
| 65 | |
| 64 [push] | 66 [push] |
| 65 default = current | 67 default = current |
| 66 | 68 |
| 69 [fetch] | |
| 70 prune = true | |
| 71 | |
| 67 [rebase] | 72 [rebase] |
| 73 autostash = true | |
| 68 stat = true | 74 stat = true |
| 69 | |
| 70 [rerere] | |
| 71 autoupdate = true | |
| 72 | 75 |
| 73 [transfer] | 76 [transfer] |
| 74 fsckobjects = true | 77 fsckobjects = true |
| 78 | |
| 75 [fetch "fsck"] | 79 [fetch "fsck"] |
| 76 zeroPaddedFilemode = ignore | 80 zeroPaddedFilemode = ignore |
| 77 badDate = ignore | 81 badDate = ignore |
| 78 badTimezone = ignore | 82 badTimezone = ignore |
| 79 | 83 |
