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?