From 64cc705a45ab5e99f5500cfffbeaec2c451db14a Mon Sep 17 00:00:00 2001
From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 24 Nov 2014 19:33:07 +0000
Subject: [PATCH] git: default to upstream when merging

---
 git/config | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.48.1