John Keeping <> writes:

> On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:
>> David Aguilar <> 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.

Then probably it is a good idea to drop this patch and replace it
with a documentation patch to suggest those who do not want --auto
to use that mechanism?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to