From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Mar 2012 20:14:19 GMT
Subject: Re: [PATCH v3 10/9] difftool: do not allow mix of '--prompt' with '--no-prompt'
Message-ID: <7vehsl1zl0.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1332358560-13774-4-git-send-email-tim.henigan@gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

> When difftool was changed to use Getopt::Long, it changed the way that
> the '--prompt' and '--no-prompt' options are handled. Prior to the change,
> if both options were given, then the last option was used.  After the
> change, if both were given, then '--prompt' was always used.
>
> This commit teaches difftool to exit with an error if both options are
> given at the command line. t7800 was updated to match.

Hrm, people with "[alias] mdt = difftool --prompt" have every right to
expect their

	$ git mdt --no-prompt

to keep working, no?