How can I combine two non-sequential git commits into one?

Question

If the following is a list of commits on a branch:

A - B - C - D

How can I combine commits A and C into (AC)?

(AC) - B - D

score 39 · Accepted Answer · edited Nov 29 '19 at 16:24

39

First do git rebase -i aaaaaa^ and then your text editor will show up looking like this:

pick aaaaaa
pick bbbbbb
pick cccccc
pick dddddd

Change it so that it looks like

pick aaaaaa
squash cccccc
pick bbbbbb
pick dddddd

and close it and git does the rest.

edited Nov 29 '19 at 16:24

JotaDeAA

answered Mar 19 '11 at 06:37

Tyler

6

And the obligatory warning: don't do this if you've already pushed any of this work. – Cascabel Mar 19 '11 at 14:21
4

Also, to clarify, `A` in the first command is the SHA1 of commit `A` (it may be abbreviated), and `aaaaaa` and friends in the editor are abbreviated SHA1s of the four commits. – Cascabel Mar 19 '11 at 14:22

score 0 · Answer 2 · answered Mar 19 '11 at 06:37

0

git rebase -i A^

edit them so that C is after A. Change the pick to f (fixup) and save.

answered Mar 19 '11 at 06:37

Dustin

2 Answers2