X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=5919b90fd3468f93369bc5a3b7a3dfb63e3896d8;hb=7221073db21340ebc2386e6df3c77482163a6662;hp=7c3b438232aae2d04ffa7bdb45a28570a72b29ab;hpb=827571cf84f3214aa131a8037cdb04cec58ea167;p=dotfiles.git

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