chiark / gitweb /
gitconfig: turn off annoying automerge
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:18 +0000 (17:22 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:18 +0000 (17:22 +0100)
templates/gitconfig.in

index ccaf2fa..65e961b 100755 (executable)
@@ -58,4 +58,6 @@ cat <<END
        ui = false
 [merge]
        conflictStyle = diff3
+[branch]
+       autoSetupMerge = false
 END