I can't seem to find an option to perform a 'git pull upstream master' using the Mac desktop client for GitHub (currently 1.2.13). Is that supported yet outside of the command line?
The Github client does not support this feature as far as I can tell.
The way to work around this you can change the primary repo to the upstream repo that you want to use and then change the repo back to your own.
And you're done.