base header auto usage in git-format

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 0263b614a5323972a520d289b4be8ddd385cbe30..b00a96b353348eef66d24d962ddf9bba3393b2f2 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,6 +19,7 @@
        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,7 +31,9 @@
 [notes]
        displayRef = *
 [diff]
-       algorithm = patience
+       algorithm = histogram
+       colorMoved = default
+       colorMovedWS = allow-indentation-change
        tool = vimdiff
 [grep]
        lineNumber = true
@@ -38,3 +41,9 @@
        tool = vimdiff
 [pull]
        ff = only
+[help]
+       autocorrect = never
+[init]
+       defaultBranch = master
+[format]
+       useAutoBase = true