From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Mar 2009 08:56:02 GMT
Subject: Re: [PATCH] difftool: add a -y shortcut for --no-prompt
Message-ID: <7veiwivxel.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1237962599-29625-1-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> This is another consistency cleanup to make git-difftool's options
> match git-mergetool.
> ...
> @@ -60,11 +60,11 @@ sub generate_command
>  			$ENV{GIT_DIFF_TOOL} = substr($arg, 7);
>  			next;
>  		}
> -		if ($arg eq '--no-prompt') {
> +		if ($arg eq '-y' || '--no-prompt') {

This was the typo that broke 'pu'; I fixed it up and re-queued the series.