out = !git-outgoing
# Branch helpers
bd = !git-branch-dates
- bv = !git branch --color -vv
+ bv = !git-branch-dates -v
cv = !git-cherry-view
# Diff helpers
df = diff
filemode = true
logallrefupdates = true
whitespace = space-before-tab, trailing-space
- excludesfile = ~/.gitignore_global
+ excludesfile = ~/.gitfiles/gitignore-global
+ attributesfile = ~/.gitfiles/gitattributes-global
pager = diff-pager
[interactive]
ui = auto
[color "diff"]
+ plain = 241
meta = blue bold
frag = magenta bold
old = red bold
[color "diff-highlight"]
oldNormal = nobold
- oldHighlight = red bold
+ oldHighlight = red bold 235
newNormal = nobold
- newHighlight = green bold
+ newHighlight = green bold black
+
+[pull]
+ rebase = false
+ ff = only
[push]
default = matching
+
+[include]
+ path = .gitconfig.local