From bbeb4854b9925ceb66c9dff440b61a446ca8780d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 14 Jan 2016 18:35:40 +0000
Subject: [PATCH] Set merge.defaultToUpstream to true

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index fe82da7..c9f2ec9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -144,3 +144,6 @@
 
 [pull]
   rebase = true
+
+[merge]
+  defaultToUpstream = true