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

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f5a87a..5919b90 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,5 +31,14 @@
 	displayRef = *
 [diff]
 	algorithm = patience
+	tool = vimdiff
 [grep]
 	lineNumber = true
+[merge]
+	tool = vimdiff
+[pull]
+	ff = only
+[help]
+	autocorrect = never
+[init]
+	defaultBranch = master