From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 09 May 2013 16:10:51 GMT
Subject: Re: [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges
Message-ID: <7vli7ob0c4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1368090810-40596-2-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> 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?