I have made some changes to a file which has been committed a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous versio
git checkout -- foo
That will reset foo to HEAD. You can also:
foo
git checkout HEAD^ foo
for one revision back, etc.