zlacker

Rebase is just automated cherry-pick, so it ends being the same. The pick command in rebase is exactly that.

> and end up with a "bad" merge.

They end up with exactly the same merge when using cherry-pick directly?

> I don't usually want to rewrite history. I just want the target branch with all my commits on top

That's ... what rewriting history is?