Stupid git commit-tree tricks, Part 4: Changing a squash to a merge

Suppose you performed a git merge --squash, and then later realized that you meant it to be a true merge rather than a squash merge. In diagrams, suppose you have this: A ← M1 ← ← ← M2   master   The post Stupid git commit-tree tricks, Part 4: Changing a squash to a merge appeared first on The Old New Thing....

Submit