X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=f947858758ae208b5e8bfe8b2d8ae13476776e67;hb=109f0f1e4e4288c2e8d2c880de8f37963526a4b0;hp=0263b614a5323972a520d289b4be8ddd385cbe30;hpb=b4609c58002ab35eb89eb58ffadbaa282fae3519;p=dotfiles.git diff --git a/git/.gitconfig b/git/.gitconfig index 0263b61..f947858 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -16,9 +16,8 @@ [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] @@ -30,11 +29,20 @@ [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