Memo to my future self: to revert a file in git to the last committed state:

git checkout myfile.php

This is basically the same as svn revert.