Git: checking out a file from a previous commit and amending it to HEAD

I recently committed a file to the HEAD of my branch which has errors in it. I need to do the following things:

• Get that file from one commit previous to HEAD


• Commit that file back into HEAD

What's the best way of going about that?

Solution 1:

You've practically said it yourself:

First get the file back from one commit before:

$> git checkout HEAD~1 path/to/file.ext

Then commit it:

$> git commit -a -m 'Retrieved file from older revision'

If only the changes to that file where present in the last commit, you can even use git-revert:

$> git revert HEAD

I think it would be better to make this a separate commit, because it tells you exactly what you've reverted, and why. However, you can squash this into the previous commit by using the --amend switch to git-commit.