From d1066676f917e8e1e0a70074061f4510bed950c9 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date: Sun, 25 May 2014 20:00:53 +0300
Subject: [PATCH] gitconfig: branch.autosetupmerge always

---
 .gitconfig.MKAYSIGREP | 2 ++
 gitconfig             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP
index 0be9133d..41b5e82c 100644
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@@ -21,3 +21,5 @@
 	signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always
diff --git a/gitconfig b/gitconfig
index 7c8f92ad..ab98ff10 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,5 @@
 	#signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always