Selectively revert or checkout changes to a file in Git?

Question

Is there a command that allows you to partially undo the changes to a file (or files) in the working directory?

Suppose you have edited a file a lot but you realize that

Answer 1

With git version >= 1.7.1 I can

git checkout -p

I am not sure when this feature was introduced.