git: use fugitive Gvdiff for mergetool + don't ask

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index bfbfc4c93ba4862057d6766642f54e8bcd8758da..06d260385da33f82bbb25e598e073ccf6dae774d 100644 (file)
--- a/git/config
+++ b/git/config
@@ -19,3 +19,9 @@
        smtpserver = smtp.gmail.com
        smtpuser = samir.benmendil@gmail.com
        smtpserverport = 587
+[mergetool "fugitive"]
+       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+[merge]
+       tool = fugitive
+[mergetool]
+       prompt = no