From 91be5d6a9ab86f14eed55a4fc0f6b8928900c21c Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 29 Apr 2014 15:48:38 +0200 Subject: [PATCH] gitconfig: enable merge.defaultToUpstream --- gitconfig.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitconfig.in b/gitconfig.in index f976890..0f2d4d0 100644 --- 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. -- 2.44.1