Automate wherever possible...
git fetch origin git rebase origin/my-new-feature git rebase origin/master
# autosetup rebase so that pulls rebase by default
git config --global branch.autosetuprebase always
git checkout master
git merge --squash newstuff