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

diff --git a/git/.gitconfig b/git/.gitconfig
index 9862326..267fd0e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,3 +1,6 @@
+[advice]
+	pushUpdateRejected = false
+	detachedHead = false
 [alias]
 	wt = worktree
 	unchanged = update-index --assume-unchanged
@@ -16,6 +19,7 @@
 	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 +31,15 @@
 [notes]
 	displayRef = *
 [diff]
-	algorithm = patience
+	algorithm = histogram
+	tool = vimdiff
 [grep]
 	lineNumber = true
-[advice]
-    detachedHead = false
+[merge]
+	tool = vimdiff
+[pull]
+	ff = only
+[help]
+	autocorrect = never
+[init]
+	defaultBranch = master