git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH try2] Improve error output of git-rebase

From
Stephan Beyer <s-beyer@gmx.net>
Date
Aug 17, 2008, 04:11 UTC
Message-ID
<20080817041135.GA23513@leksak.fem-net>
In-Reply-To
<1218945930-29281-1-git-send-email-s-beyer@gmx.net>
Hi,
Stephan Beyer wrote:
Show 6 quoted lines
> @@ -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
Previous: Stephan BeyerNext: Stephan Beyer
Message 4 of 6 in “Improve error output of git-rebase without any arguments”
  1. Improve error output of git-rebase without any argumentsStephan Beyer, Aug 17, 2008
  2. Junio C HamanoAug 17, 2008
  3. Improve error output of git-rebaseStephan Beyer, Aug 17, 2008
  4. Stephan BeyerAug 17, 2008
  5. Improve error output of git-rebaseStephan Beyer, Aug 17, 2008
  6. Junio C HamanoAug 17, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.