David Aguilar <davvid@xxxxxxxxx> writes: > Marked "RFC" because I am kinda against adding more configuration > variables. Just like "git merge" has -X<option> escape hatch to allow us to pass backend-specific options, perhaps you can add a mechanism to "git mergetool" to let the user pass --no-auto from the command line? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html