From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 24 Nov 2014 19:33:07 +0000 (+0000)
Subject: git: default to upstream when merging
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/64cc705a45ab5e99f5500cfffbeaec2c451db14a?hp=44164ac1b50f0d6e28d3eb84512483b5fcdea8b4

git: default to upstream when merging
---

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