X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=31d95a546a1220120e44f9302e2a229de834740e;hb=a4b978f074ff590832d3b844d85fc79ae55b2096;hp=267fd0ef5b7c286c0e578a1fc3bedcda783df510;hpb=efcd0f60b73654753520133f29a0410963686215;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 267fd0e..31d95a5 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]
@@ -32,14 +30,21 @@
 	displayRef = *
 [diff]
 	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
+[include]
+	path = /home/stargrave/.git-safe