David Aguilar <davvid@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
