X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=b00a96b353348eef66d24d962ddf9bba3393b2f2;hb=bc6ede2a83586e1799bdabf0ddf0bb1a38d8151f;hp=c5eff0d930a8b7ffa71db3a193e79fc642660991;hpb=8f6bba88ba427bf242030e98ccc14618e65460ef;p=dotfiles.git

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