Is it still possible to restore deleted untracked

问题:

let's say yesterday I did some changes on my master branch, and I forgot to add, commit them. and in the morning i did

git reset --hard

is it possible to restore deleted files in this situation ?

回答1:

Some better IDEs keep track of your files as a local history. If you removed files externally (say, git reset) you should be able to click in your IDE on parent directory and choose "Compare with local history".

I used this feature successfully in PHPStorm IDE when my untracked files got wiped out by some utility...

回答2:

No................... It isn't.

回答3:

git reset --hard is a very dangerous command, so be careful when you use it next time :)

If you do not have any commit for those files, it seems you have no chance restore them.

Otherwise, reflog command can help you.

回答4:

(Note: The steps seem to have changed a bit, since the accepted answer was posted. But the idea remains the same.)

To add to the accepted answer, I was able to recover my deleted files using Webstorm 2016.

1. First, I lost my file doing a forced clean using git git clean -f.

2. To recover it, I went in Webstorm and did the following steps:

   • Go to Project tab for your project, right click to get to 'Show History' under 'Local History'. (As shown in this picture.)

   • Once 'Show History' is clicked, one can see the pop up with 'External Change -> Revert' in it. Click to revert the desired files on right. (As shown in the attached picture.)

   • After the above 2 steps, you should see your file come back in 'Project' tab. 'Local History' pop up will show something like in this attached picture. Reverted to External ChangeYou will get an option to get it add to Git.

   • To untrack it, just do a git reset HEAD <filename> from the command line.

回答5:

You can't access to previous version of untracked deleted files from git, because, of coruse, they do not exist. I would recover them from some backup (maybe there are hidden backup files left by the ide/editor?), or, in alternative, I would avoid working on that filesystem too much and start searching for recovery tools.

回答6:

git reset --hard won't remove untracked files. git clean will, however.

However if you git add the files, don't git commit them and then run git reset --hard those files will be lost.

But it's ok, as they can be recovered, as shown in this answer. (Well, until the next git gc).