You can use the --onto flag for git rebase
git rebase --onto origin/master
It will checkout origin/master and replay the current branch on top.P.S. I had to check the man page as I use Magit. In the latter I tap r, then u. In magit my upstream is usually the main trunk. You can also tap e instead of u to choose the base branch.