comparison: .gitconfig
.gitconfig
- changeset 1089
- 81b964cde5b9
- parent 1028
- 77e65ab97892
equal
deleted
inserted
replaced
| 1088:c221227cbba5 | 1089:81b964cde5b9 |
|---|---|
| 1 # vim: noet:ts=8:sw=8 | |
| 1 [user] | 2 [user] |
| 2 email = mhoward@roomag.org | 3 email = mhoward@roomag.org |
| 3 name = Meredith Howard | 4 name = Meredith Howard |
| 4 | 5 |
| 5 [github] | 6 [github] |
| 48 [merge] | 49 [merge] |
| 49 tool = vimdiff3 | 50 tool = vimdiff3 |
| 50 guitool = gvimdiff | 51 guitool = gvimdiff |
| 51 conflictstyle = diff3 | 52 conflictstyle = diff3 |
| 52 | 53 |
| 54 [mergetool] | |
| 55 keepBackup = false | |
| 56 hideResolved = true | |
| 57 | |
| 53 [branch] | 58 [branch] |
| 54 autosetupmerge = always | 59 autosetupmerge = always |
| 55 | 60 |
| 56 [commit] | 61 [commit] |
| 57 verbose = true | 62 verbose = true |
| 82 badTimezone = ignore | 87 badTimezone = ignore |
| 83 | 88 |
| 84 # include.path is available in git 1.7.10 and later | 89 # include.path is available in git 1.7.10 and later |
| 85 [include] | 90 [include] |
| 86 path = ~/.gitconfig.local | 91 path = ~/.gitconfig.local |
| 87 | |
| 88 # vim: noet:ts=8:sw=8 |
