git: default to upstream when merging

[dotfiles.git] / git / config

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