git checkout HEAD -- my-file.txt # ... which will update both the working copy of my-file.txt and # its state in the index with that from HEAD. # -- basically means: treat every argument after this point as a file name.