Git - undoing git rm

Question

Possible Duplicate:
How to revert a “git rm -r .”?

Git SOS here. I worked 10 hours on a project without committing (I know, I know) and then I git added too many files, so I tried using git rm and accidentally deleted EVERYTHING. Is there hope for me? :(((

Solution

If you already commited changes, then:

git reset (--hard) HEAD~1

If not then:

git reset
git ls-files -d -z | xargs -0 git checkout --

Comments

[Tamás Szelei]

Would git reset --hard HEAD work in the second case?

[Hauleth]

Will, but it will also discard all your changes.

[Tamás Szelei]

Ah, ok. What exactly is the second line doing here? Is it strictly undoing the rm, or does it have a wider effect?

[Hauleth]

It remove all files in index and then checkout all modified files to HEAD.

[Omar Wagih]

You're a freaking lifesaver!

[Craig Brett]

Be careful when using the second one, I tried using it to recover some accidentally rm'd files and lost my uncommitted changes. Noob mistake I guess.

[Hauleth]

To restore deleted files the last part should look like git ls-files -d and thet it will recover only deleted files.

[Carles Jove i Buxeda]

I lost all my uncommited changes after git checkout -- $(git ls-files -m). I don't know if what other people are commenting here is right (using git ls-files -d instead), but someone who knows should edit this answer

[Chris P]

git checkout -- $(git ls-files -d) This doesn't work if the filenames have spaces in them

[Chris P]

git ls-files -d -z | xargs -0 git checkout -- is the way to go for the generic case with filename spaces (jennyandlih.com/using-git-ls-files-input-xargs)

[timeyyy]

install trash and then alias rm=trash in .zshrc or similar, now all deletes are undo able :)

[lucasfcosta]

You just saved my whole day of work. I learned a lesson today.

[kaiser]

I have never ever before been so much in love as with your lines above.

[Arthur]

Is xargs only for linux? How can I do the same thing from the Windows command line?