如何还原提交的特定文件？

Question

I have pushed a commit that modified files file1, file2, file3, file4, file5.
I have decided that the logic is wrong and as part of the commit I modified some APIs in files2,file3.
What I want to do is somehow revert the changes localy for files2,files3 and and fix the rest of the files correctly.
So start my fix having as base the original version of the files2,files3 but the latest of the rest.
How can I do that?

Answer 1

Easiest way to do this:

# get the version of the file from the given commit
git checkout <commit> path/to/file

In my case:

git checkout b1cdc80fffe381eb3938e7b7f337d6550ffbd199 /MyProjects/AndroidCameraAPI/app/src/main/java/info/androidhive/androidcameraapi/MainActivity.java

Then modified my code and did the commit again.

NOTE: The commit has I have used in my example was the stable version, in which I wanted to revert back.

Answer 2

The easiest way is to soft reset your commit (this will keep the changes in your files but not committed). Discard the changes for the files2 and files 3 (this will set them back to the previous commit).

Git reset documentation