rlwrapped passman

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 7c3b438232aae2d04ffa7bdb45a28570a72b29ab..0263b614a5323972a520d289b4be8ddd385cbe30 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -31,5 +31,10 @@
        displayRef = *
 [diff]
        algorithm = patience
+       tool = vimdiff
 [grep]
        lineNumber = true
+[merge]
+       tool = vimdiff
+[pull]
+       ff = only