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

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f5a87a..f947858 100644
--- 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