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

How to interactively rebase-and-reword nth commit?

From
KKKonstantin Kharlamov <hi-angel@yandex.ru>
Date
Aug 25, 2021, 14:06 UTC
Message-ID
<eda317b080a2e75a170c051c339a76115cce5ad7.camel@yandex.ru>

I think, one of the most frequent git features used is `rebase -i`. There's a common workflow I think everyone knows: you have commits 1, 2, 3, then you decide "Nah, 2nd commit needs a change", so you do `git rebase -i HEAD~2`, then in popped up editor you modify the `pick` on the first line to become `edit`, then you do the change, then `git rebase --continue`.

The boilerplate part here: even though you know that you want to edit HEAD~2, there is no way to tell git that right away. Every time you have to launch editor, edit the line manually, then save it, close it.

I have seen here some discussions about improving that, someone even posted patches, but I'm not aware if it went anywhere. So I created 2 years ago a shell wrapper `rebase-at`¹, which upon called as `rebase-at e HEAD~2`, does the thing described above automatically. Under the hood I simply substitute EDITOR with `sed` command that replaces `pick` on the first line (the HEAD~2 commit) with `e`. If used with shell autocompletion, it is now practically instantaneous.

I'm almost happy with `rebase-at`, except I don't know of any way to make it work with `reword` git action. You see, "rewording a commit" requires to run EDITOR twice: first to substitute `pick` with `reword`, and then to actually edit the commit message. But since EDITOR was substituted with sed, the 2nd run won't give you an actual editor to change the commit message.

Any ideas, how can I tell `git` that I want to "reword" nth commit right away? Sure, I am not the first one to stumble upon it, am I? Any ideas?

1: https://github.com/Hi-Angel/dotfiles/blob/0b9418224e4ce7c9783dbc2d9473fd1991b9b0b2/.zshrc#L148-L160
Next: Ævar Arnfjörð Bjarmason
Message 1 of 7 in “How to interactively rebase-and-reword nth commit?”
  1. Konstantin KharlamovAug 25, 2021
  2. Ævar Arnfjörð BjarmasonAug 25, 2021
  3. Martin ÅgrenAug 25, 2021
  4. Konstantin KharlamovAug 25, 2021
  5. ZheNing HuAug 26, 2021
  6. Jeff KingAug 27, 2021
  7. Konstantin KharlamovAug 27, 2021

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.