Thread (7 messages) flat view 7 messages, 5 authors, 2021-08-27

Re: How to interactively rebase-and-reword nth commit?

From: Konstantin Kharlamov <hidden>
Date: 2021-08-27 09:18:08

On Thu, 2021-08-26 at 22:04 -0400, Jeff King wrote:
On Wed, Aug 25, 2021 at 05:06:03PM +0300, Konstantin Kharlamov wrote:
quoted
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?
Have you looked at the new --fixup options in 2.32? E.g.:

  git commit --fixup reword:HEAD~2

will immediately drop you in an editor to adjust the commit message. The
result is a new "fixup" commit which is then applied when you
autosquash. So you could do multiple such adjustments, and then:

  GIT_EDITOR=: git rebase -i --autosquash

to apply them all to the appropriate spots.

-Peff
Thank you for the suggestion! I think I gonna stick to the `rebase-at` now that I know the way to solve my problem with GIT_SEQUENCE_EDITOR. The "rebase-at" workflow sounds better optimized to me, due to lack of the `git rebase -i --autosquash` step.

I get that the idea with autosquash that you can remove the commit if you realize you did something wrong. But I usually have a copy of the local branch on a remote repo, so in rare cases I realize I want to undo the change I can simply run `git reset --hard origin/mybranch` ☺ (otherwise, reflog is also a thing).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help