histogram diff algorithm is cooler

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f5a87a5d56b0431528fc2ec5062306ea0cc3425..267fd0ef5b7c286c0e578a1fc3bedcda783df510 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,3 +1,6 @@
+[advice]
+       pushUpdateRejected = false
+       detachedHead = false
 [alias]
        wt = worktree
        unchanged = update-index --assume-unchanged
@@ -16,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]
@@ -27,6 +31,15 @@
 [notes]
        displayRef = *
 [diff]
-       algorithm = patience
+       algorithm = histogram
+       tool = vimdiff
 [grep]
        lineNumber = true
+[merge]
+       tool = vimdiff
+[pull]
+       ff = only
+[help]
+       autocorrect = never
+[init]
+       defaultBranch = master