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

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