How to keep your fork in sync

Give this command only once for each local clone:
git remote add upstream https://github.com/CollaboraOnline/online.git

Every time you want to sync your fork with the original repo:
git fetch upstream
git checkout master
git merge upstream/master
git push