How do I squash and edit the same commit?

Question

When I do an interactive rebase in git, how do I squash a commit and also stop end edit the same commit?

I had hoped to cleverly solve this by adding `edit HEAD` to the todo, referring to the newly squashed commit. But HEAD is resolved too early so it doesn't work :( — David Cook, Aug 26 '21 at 01:54

score 7 · Answer 1 · answered Oct 28 '16 at 20:20

7

Do it in two steps, first squash and next in second run of interactive rebase edit squashed commit.

answered Oct 28 '16 at 20:20

score 6 · Answer 2 · answered Sep 11 '18 at 14:37

6

Alternatively, you could use 'edit' to edit the commit, and then do e.g.

git reset --soft HEAD^
git commit --amend

answered Sep 11 '18 at 14:37

ObsequiousNewt

This is what I typically do. I have a git alias `undo = reset HEAD^`. – cambunctious Oct 16 '21 at 17:23

2 Answers2