BTW, the "git --whitespace=fix rebase upstream/master" instruction should only be relevant if you have outstanding development work on a topic branch that you created before David fixed the whitespace and now you want to rebase the topic branch to the master branch before integrating your development work. If you only have a local repo that you use to follow upstream you shouldn't need to do that, you can just "git pull upstream".