On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote: > 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? We already have "mergetool.<tool>.cmd" which allows a completely custom command line to be specified. IIUC this can be used to override the built-in command for tool names that already exist. I'm not sure an extra -X<option> buys us much on top of this, but perhaps it would be useful for one-off usage. -- 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