From: Stephen Boyd <bebarino@gmail.com>
To: "Björn Gustavsson" <bgustavsson@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Teach 'rebase -i' the command "reword"
Date: Mon, 05 Oct 2009 19:34:19 -0700 [thread overview]
Message-ID: <4ACAACAB.3020707@gmail.com> (raw)
In-Reply-To: <4ACA1BD1.6050905@gmail.com>
Björn Gustavsson wrote:
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 0aefc34..52af656 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -368,6 +368,9 @@ By replacing the command "pick" with the command "edit", you can tell
> the files and/or the commit message, amend the commit, and continue
> rebasing.
>
> +If you just want to edit the commit message for a commit, you can replace
> +the command "pick" with the command "reword".
> +
Maybe use the imperative here. So instead of "you can replace" just say
"replace".
Also, two paragraphs down we say "In both cases ..." but now there are
three cases right? Maybe we should say
When a "pick" doesn't succeed (because of merge errors) or when "pick"
has been replaced with another command, ...
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 23ded48..30c2f62 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
>
> @@ -752,6 +760,7 @@ first and then run 'git rebase --continue' again."
> #
> # Commands:
> # p, pick = use commit
> +# r, reword = use commit, but allow editing of the commit message
How about this?
use commit, but stop to edit (or reword?) the commit message
next prev parent reply other threads:[~2009-10-06 2:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-05 16:16 [PATCH] Teach 'rebase -i' the command "reword" Björn Gustavsson
2009-10-05 20:38 ` Johannes Schindelin
2009-10-06 2:09 ` Sebastian Pipping
2009-10-06 2:34 ` Stephen Boyd [this message]
2009-10-06 7:03 ` Björn Gustavsson
2009-10-06 7:23 ` Johannes Sixt
2009-10-06 7:43 ` Stephen Boyd
2009-10-06 8:25 ` Björn Gustavsson
-- strict thread matches above, loose matches on Subject: below --
2009-10-07 6:13 Björn Gustavsson
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=4ACAACAB.3020707@gmail.com \
--to=bebarino@gmail.com \
--cc=bgustavsson@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).