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]
+ diffFilter = diff-filter
[diff]
renames = copies
ui = auto
[color "diff"]
+ plain = 241
meta = blue bold
frag = magenta bold
old = red bold
untracked = blue bold
[color "diff-highlight"]
- oldNormal = red bold
- oldHighlight = red bold 52
- newNormal = green bold
- newHighlight = green bold 22
+ oldNormal = nobold
+ oldHighlight = red bold 235
+ newNormal = nobold
+ newHighlight = green bold black
[push]
default = matching
+
+[include]
+ path = .gitconfig.local