X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=f947858758ae208b5e8bfe8b2d8ae13476776e67;hb=109f0f1e4e4288c2e8d2c880de8f37963526a4b0;hp=b00a96b353348eef66d24d962ddf9bba3393b2f2;hpb=bc6ede2a83586e1799bdabf0ddf0bb1a38d8151f;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index b00a96b..f947858 100644
--- 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,6 +37,7 @@
 	lineNumber = true
 [merge]
 	tool = vimdiff
+	conflictStyle = zdiff3
 [pull]
 	ff = only
 [help]