Rebase "fixup" commit into prior merge commit

Question

I have performed the following merge:

A---B---C---E (HEAD, merge of C and D)
           /
      D---|

But I noticed some issues in E, and fixed them in F:

A---B---C---E---F (HEAD)
           /
      D---|

I want to modify commit E so that it contains the "fixup" changes made in F.

When I try git rebase -p -i HEAD~2, it tries to create a regular (not merge) commit, and even tries to make me re-resolve the conflicts I already resolved when performing the merge for E.

How do I fixup commit E so it contains the changes made in F?

score 5 · Accepted Answer · answered Dec 23 '19 at 14:42

5

git reset --soft E
git commit --amend

should be enough. It'll recreate a merge commit (with a different hash than E, let's call it E') while inserting whatever changes you made between E and F.

answered Dec 23 '19 at 14:42

Romain Valeri

19,645
3
36
61

1

`git reset --soft`is just a gem. – eftshift0 Dec 23 '19 at 15:05
1

What if there was a `G` (`H`, `I`, ...) commit after `E`? – Dan M. Jun 10 '20 at 17:12
@DanM.then changes in these other commits would also be grouped within the new commit. – Romain Valeri Jun 11 '20 at 08:05

Rebase "fixup" commit into prior merge commit

1 Answers1