Git: Squash commits in history keeping graph structure

Question

I have a not yet published local repo with graph structure like this:

*   G 
*   F
|\
| * E
| * D
* | C: A minor fix -- SQUASHME  
* | B
|/
*   A

So I want to squash commits B and C into a single commit, keeping (I suspect it'll take recreating/rewriting commits to keep) this graph structure with its branching and merging points.

Any pointers?

@BjörnKautler Please answer this question so that I may learn something new. — Tim Biegeleisen, May 06 '16 at 10:08
Hello this link may help you please check http://stackoverflow.com/questions/6934752/combining-multiple-commits-before-pushing-in-git — Amol Udage, May 06 '16 at 10:20
@AmolUdage The link will not help, as it would remove the branch- and merge-points and create a linear history instead. — Vampire, May 06 '16 at 10:33

Vampire · Accepted Answer · 2016-05-06T10:32:01.653

1

git rebase -i A -p

then use fixup or squash stanza for C, depending on whether you want to use the commit message of B or want to edit it.

Note: Without the -p parameter the merges will be transformed into linear history.

edited May 06 '16 at 10:32

answered May 06 '16 at 10:17

Vampire

35,631
4
76
102

Ah, sorry, a local alias to not use `vim` but `jEdit` as editor. I removed it from the answer – Vampire May 06 '16 at 10:32

Git: Squash commits in history keeping graph structure

1 Answers1