fix(git): Fixup should only squash one commit

gitext-rs / git-stack

Stacked branch management for Git

Apache License 2.0

508 stars 19 forks source link

fix(git): Fixup should only squash one commit #138

Closed epage closed 2 years ago

epage commented 2 years ago

With commits like

commita
commitb
fixup!: commita we were getting
commita

It was unclear what selecting the base for merge_trees does, so we were using the merge base of the fixup and its target. On a whim, I tried changing it to the parent of the fixup and it seemed to work!

Fixes #137