git-rebase --onto master branch topic

is awesome!

(where master is branch's parent, branch is topic's parent)