Let's try to use zdiff3

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 2abb7ec321c42d58d3881d0fb70c4e3c1c397148..f947858758ae208b5e8bfe8b2d8ae13476776e67 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -16,8 +16,6 @@
 [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]
@@ -39,9 +37,12 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+       conflictStyle = zdiff3
 [pull]
        ff = only
 [help]
        autocorrect = never
 [init]
        defaultBranch = master
+[format]
+       useAutoBase = true