Subject: Re: [PATCH] difftool: add a -y shortcut for --no-prompt

From: Junio C Hamano <[email-masked]>
Date: Sat, 28 Mar 2009 01:56:02 -0700

David Aguilar <[email-masked]> 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.