git rebase remotes/upstream/master

pause