...or you simply rebase the subset of commits of your branch onto the rewritten branch. That's like 10 simple button presses in magit.