From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 29 Apr 2014 13:48:38 +0000 (+0200)
Subject: gitconfig: enable merge.defaultToUpstream
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=91be5d6a9ab86f14eed55a4fc0f6b8928900c21c

gitconfig: enable merge.defaultToUpstream
---

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.