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

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

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Oct 6, 2009, 07:23 UTC
Message-ID
<4ACAF07D.2030604@viscovery.net>
In-Reply-To
<4ACAEBBA.9000806@gmail.com>
Björn Gustavsson schrieb:
Show 20 quoted lines
> @@ -368,17 +368,17 @@ 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".
> +If you just want to edit the commit message for a commit, replace the
> +command "pick" with the command "reword".
>  
>  If you want to fold two or more commits into one, replace the command
>  "pick" with "squash" for the second and subsequent commit.  If the
>  commits had different authors, it will attribute the squashed commit to
>  the author of the first commit.
>  
> -In both cases, or when a "pick" does not succeed (because of merge
> -errors), the loop will stop to let you fix things, and you can continue
> -the loop with `git rebase --continue`.
> +When "pick" has been replaced with "edit" or when a "pick" does not
> +succeed (because of merge errors), the loop will stop to let you fix
> +things, and you can continue the loop with `git rebase --continue`.

Since "reword" is "pick" + editor, it can fail due to conflicts as well. Perhaps:

'git-rebase' will stop after an edit command or when a command failed (due to merge errors). When you are done with your edits or with resolving merge conflicts, continue with `git rebase --continue`.

(I'm unsure about the mark-up.)
-- Hannes
Previous: Björn GustavssonNext: Stephen Boyd
Message 6 of 8 in “Teach 'rebase -i' the command "reword"”
  1. Teach 'rebase -i' the command "reword"Björn Gustavsson, Oct 5, 2009
  2. Johannes SchindelinOct 5, 2009
  3. Sebastian PippingOct 6, 2009
  4. Stephen BoydOct 6, 2009
  5. Björn GustavssonOct 6, 2009
  6. Johannes SixtOct 6, 2009
  7. Stephen BoydOct 6, 2009
  8. Björn GustavssonOct 6, 2009

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.