From d9f557987d55a5ef0400d8204d68d23131c9829d Mon Sep 17 00:00:00 2001
From: 10sr <8.slashes@gmail.com>
Date: Sun, 28 Apr 2019 12:25:44 +0900
Subject: [PATCH] Set git branch.autoSetupMerge to always

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 541120d..023e67d 100644
--- a/Makefile
+++ b/Makefile
@@ -301,6 +301,7 @@ else
 	$(git_conf) fetch.pruneTags true
 	$(git_conf) push.default current
 	$(git_conf) pull.ff only
+	$(git_conf) branch.autoSetupMerge always
 ifneq (,$(xz))
 	$(git_conf) tar.txz.command "xz -c"
 endif