Single line upsteam rebase

Not sure if it is better to use the `git checkout {the-branch-you-are-working-on} ` rather than `master`