Git checkout — recover lost files

Question

I accidentaly deleted local file changes on git repository. They were NOT commited or even pushed.

What I did: git status (then files not staged for commit showed and I accidentaly removed whole folder called "smdr" by this comand): git checkout -- smdr

Then files changes disappeared.

How can I recover those files (birng everything back before that git checkout -- smdr comand)?

Answer 1

You can't with Git. The files were not committed so they are not in history. You just got the (inexistant) version in the index with git checkout.

Your only hope is your backup system.

Answer 2

You can use any of the given options:

Git reflog

Type git reflog and checkout the commit you need, it will "revert" your repository to the "deleted" commit.

Git revert

Another option is use git revert SHA-1 which will revert your commit. It will simply undo your changes

Git reset

Git reset will checkout the content of the given sha-1. It will set your branch to be at the same state as the SHA-1