git: default to upstream when merging

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 06d260385da33f82bbb25e598e073ccf6dae774d..911ad2cb09b8360af159ec06d02c041714ab9f17 100644 (file)
--- a/git/config
+++ b/git/config
@@ -23,5 +23,6 @@
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
        tool = fugitive
+       defaultToUpstream = true
 [mergetool]
        prompt = no