Re: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error

David Brown [off-list ref] writes:

On Sun, Jan 06, 2008 at 06:33:32PM +0100, Wincent Colaiuta wrote:

quoted

El 6/1/2008, a las 16:46, Steffen Prohaska escribió:

quoted

@@ -310,7 +310,7 @@ do_next () {

		;;
	*)
		warn "Unknown command: $command $sha1 $rest"
-		die_with_patch $sha1 "Please fix this in the file $TODO."
+		die_with_patch $sha1 "Please fix this in the file
$TODO. And run  'git rebase --continue'."

Grammar nit: sentences can't start with "And", so that should really be:

Not true:
<http://www.accu-assist.com/grammar-tips-archive/11-07-06_GrammarTip_and-but-conjunctions.htm>

Although, in this case, I would agree that it should just be one sentence
with a comma.  It's more of a stylistic construct, more common in fiction
than technical documentation.

I've always wondered why this part can't just re-launch the
editor with the $TODO file, have the instruction to "fix" in the
file for the user to see (together with the original "#
commented out" instructions), and do the --continue itself.