Re: [PATCH] Teach 'rebase -i' the command "reword"

From: Stephen Boyd <bebarino@gmail.com>
Date: Oct 6, 2009, 02:34 UTC
Message-ID: <4ACAACAB.3020707@gmail.com>
In-Reply-To: <4ACA1BD1.6050905@gmail.com>

Björn Gustavsson wrote:

Show 11 quoted lines

> 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, ...

Show 10 quoted lines

> 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