deleted directory in Git by mistake

Question

By mistake I have deleted a directory in my git repo, and commited it.

I have done

git checkout LONG_SHA_ID

where LONG_SHA_ID is the ID of the previous commit, and I have got the directory back, but also I have got back the previous versions of some files that I have fixed in the latest commit.

How can I get back the deleted directory, with the latest version of the other files?

Answer 1

做这个：

git checkout LONG_SHA_ID -- /path/of/directory/you/deleted

Answer 2

Checkout the branch with the fixed files, and do git reset --mixed HEAD^ . This will undo the commit so you can try again without deleting the folder.

Answer 3

Just revert back the last commit by

git revert HEAD

That will back out the most recent commit. Then just push it up. You can replace HEAD with the revision you want out.

For more details about undo a git commit, look on here