From: Stephan Beyer <s-beyer@gmx.net>
Date: Sun, 17 Aug 2008 04:11:35 GMT
Subject: Re: [PATCH try2] Improve error output of git-rebase
Message-ID: <20080817041135.GA23513@leksak.fem-net>
In-Reply-To: <1218945930-29281-1-git-send-email-s-beyer@gmx.net>

Hi,

Stephan Beyer wrote:
> @@ -285,7 +294,7 @@ else
>  	if test -d "$dotest"
>  	then
>  		die "previous rebase directory $dotest still exists." \
> -			'try git-rebase < --continue | --abort >'
> +			'Try git-rebase (--continue | --abort | --skip)'
				^^
			This should perhaps be dashless. :\

And when "git rebase -m" has been invoked, a conflict occurs and the
user is typing "git rebase", then

	fatal: Needed a single revision
	invalid upstream

shows up again. So the patch does not affect all cases... :|

Regards

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F