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

diff --git a/git/.gitconfig b/git/.gitconfig
index 9862326..0263b61 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,3 +1,6 @@
+[advice]
+	pushUpdateRejected = false
+	detachedHead = false
 [alias]
 	wt = worktree
 	unchanged = update-index --assume-unchanged
@@ -28,7 +31,10 @@
 	displayRef = *
 [diff]
 	algorithm = patience
+	tool = vimdiff
 [grep]
 	lineNumber = true
-[advice]
-    detachedHead = false
+[merge]
+	tool = vimdiff
+[pull]
+	ff = only