Let's try to use zdiff3

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f5a87a5d56b0431528fc2ec5062306ea0cc3425..f947858758ae208b5e8bfe8b2d8ae13476776e67 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
@@ -13,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]
@@ -27,6 +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