[core]
excludesfile = /home/stargrave/.git-ignore
quotepath = false
- filemode = true
- logallrefupdates = true
whitespace = blank-at-eol, space-before-tab, tab-in-indent, blank-at-eof
+ pager=diff-highlight | $PAGER
[log]
date = iso8601
[push]
[notes]
displayRef = *
[diff]
- algorithm = patience
+ algorithm = histogram
+ colorMoved = default
+ colorMovedWS = allow-indentation-change
tool = vimdiff
[grep]
lineNumber = true
[merge]
tool = vimdiff
+ conflictStyle = zdiff3
[pull]
ff = only
+[help]
+ autocorrect = never
+[init]
+ defaultBranch = master
+[format]
+ useAutoBase = true
+[include]
+ path = /home/stargrave/.git-safe