[sebastianmestre]

    git rebase --onto squashed nonsquashed next-pr

Works fine in my experience (except when submodules are involved)