Git + Rails: How to restore files deleted with "git rm -r"?

Question

I deleted my db folder in a rails application in with git rm -r

I've tried

git reset HEAD

and

git reset --hard HEAD

but the migration files arent coming back. I tried commiting, then running the reset and still nothing.

What should I do?

Answer 1

You can checkout the file from the commit where it still exists. Here's how to do it.

git checkout <commit where the file still exists> -- db
# Example:
git checkout 6936142 -- db

# This also works, but if you have a branch named the same as the file or path,
# it will throw an error.
git checkout 6936142 db

Answer 2

Try git reset --hard HEAD^1 (the commit just before HEAD). Or you can get the hash of a previous known working commit with git log, then git reset --hard <hash>.

Answer 3

You can checkout individual files from your last commit or index.

git checkout db/* checks out everything under db from the index

git checkout master db/* checks out everything under db from the head of the master branch

you may be able to salvage most of your stuff that way

read more: git help checkout