From fd34cab4b9688d4b532cc60307f867ceb4194476 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 13 Sep 2018 17:22:18 +0100
Subject: [PATCH] gitconfig: turn off annoying automerge

---
 templates/gitconfig.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index ccaf2fa..65e961b 100755
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -58,4 +58,6 @@ cat <<END
 	ui = false
 [merge]
 	conflictStyle = diff3
+[branch]
+	autoSetupMerge = false
 END
-- 
2.30.2