How to rebase a git branch that contains a merge commit *and* corresponding, previous branch-point
I am trying to interactively rebase commits from the branch tmp/20241220-rebase-source
onto tmp/20241220-rebase-target
.
The commits to rebase include a branching point and corresponding merge-commit (ba87116b). This is how tmp/20241220-rebase-source
looks like: