How to merge a forked repository with GitHub

I recently forked this repository and after my first pull request I wanted to update my fork. Here is how to do it :

git clone git@github.com:vlad59/PicasaWebSync.git
cd PicasaWebSync/
git remote add upstream git://github.com/bradyholt/PicasaWebSync.git
git fetch upstream
git merge upstream/master
git push

Technology and Me

How to merge a forked repository with GitHub