From: Junio C Hamano <gitster@pobox.com>
To: Wincent Colaiuta <win@wincent.com>
Cc: Steffen Prohaska <prohaska@zib.de>, git@vger.kernel.org
Subject: Re: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error
Date: Sun, 06 Jan 2008 12:14:53 -0800 [thread overview]
Message-ID: <7vtzlq4soy.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080106195044.GA24169@old.davidb.org> (David Brown's message of "Sun, 6 Jan 2008 11:50:44 -0800")
David Brown <git@davidb.org> writes:
> On Sun, Jan 06, 2008 at 06:33:32PM +0100, Wincent Colaiuta wrote:
>>El 6/1/2008, a las 16:46, Steffen Prohaska escribió:
>>
>>> @@ -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.
prev parent reply other threads:[~2008-01-06 20:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-06 15:46 [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error Steffen Prohaska
2008-01-06 17:33 ` Wincent Colaiuta
2008-01-06 19:50 ` David Brown
2008-01-06 20:14 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vtzlq4soy.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
--cc=win@wincent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).