From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 13 Sep 2018 16:22:18 +0000 (+0100)
Subject: gitconfig: turn off annoying automerge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=commitdiff_plain;h=fd34cab4b9688d4b532cc60307f867ceb4194476

gitconfig: turn off annoying automerge
---

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