gitconfig: turn off annoying automerge

[ian-dotfiles.git] / templates / gitconfig.in

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