I refer back to this useful email from Mike Pountney pretty frequently, even though it’s easy enough to look up, so thought I’d save it here.
git checkout master &&
git pull &&
git fetch upstream &&
git merge upstream/master &&
git push
If you’d like to be notified when I publish a new post, and possibly receive occasional announcements, sign up to my mailing list: