How to rebase an overgrown branch in git?

Question

git

Good afternoon.
In the picture you see
1) The conditional repository state model at the moment
2) and 3) The states I would like to go to with git rebase
master, tmp1 and tmp2 are branches
I did not forget anything in the second picture. Everything is exactly as I imagine it.
Thanks

Answer 1

The easiest way is probably to do git rebase --interactive --rebase-merges in the tmp1 and tmp2 branches and manually build the desired structure.
See the REBASING MERGES section of the git rebase help.