gitconfig: enable merge.defaultToUpstream

diff --git a/gitconfig.in b/gitconfig.in
index f97689006ea2155c96ee99dbc991ff78682a85b8..0f2d4d0fcc11df4ed849626668cd2d770035f929 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -174,6 +174,9 @@
 [merge]
        tool = vimdiff
 
+       # Merge upstream branch if `git merge` is called without arguments.
+       defaultToUpstream = yes
+
 [push]
        # When running git push without a refspec push only the current
        # branch, see man page git-config(1) for details.