`git rebase -i upstream/master`. Might be pushed but in your fork, so it's ok.