X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=b3d796fd5889cee173806688567889e9e3d31a89;hb=382b09b3f55febb323d0f1fe5b1d7250b0b8a4f7;hp=9862326e3b7dfb6e94b0096fae5ea634bfd1038c;hpb=a5e85a783b53736f297c87d1e8537a8ddeba6840;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 9862326..b3d796f 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,8 +29,19 @@
 [notes]
 	displayRef = *
 [diff]
-	algorithm = patience
+	algorithm = histogram
+	colorMoved = default
+	colorMovedWS = allow-indentation-change
+	tool = vimdiff
 [grep]
 	lineNumber = true
-[advice]
-    detachedHead = false
+[merge]
+	tool = vimdiff
+[pull]
+	ff = only
+[help]
+	autocorrect = never
+[init]
+	defaultBranch = master
+[format]
+	useAutoBase = true