Contributing to OSS made me learn today what to do when asked to rebase on to master.

First update your local copy from the remote:

$ git fetch upstream
$ git checkout master
$ git merge upstream/master
$ git push

Then rebase and force push to update your pull request:

$ git checkout my-branch
$ git rebase upstream/master
$ git push -f

The resulting git graph looks really nice, I’ll give this a try more often!