我删除了一些文件。
我还没有承诺。
我想重置我的工作空间来恢复文件。
我做了一个git结帐。
但被删除的文件还是不见了。
git状态显示:
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted: cc.properties
# deleted: store/README
# deleted: store/cc.properties
#
为什么不结帐。将工作空间重置为HEAD?
当前回答
I had the same problem and none of the answers here I tried worked for me either. I am using Intellij and I had checked out a new branch git checkout -b minimalExample to create a "minimal example" on the new branch of some issue by deleting a bunch of files and modifying a bunch of others in the project. Unfortunately, even though I didn't commit any of the changes on the new "minimal example" branch, when I checked out my "original" branch again all of the changes and deletions from the "minimal example" branch had happened in the "original" branch too (or so it appeared). According to git status the deleted files were just gone from both branches.
Fortunately, even though Intellij had warned me "deleting these files may not be fully recoverable", I was able to restore them (on the minimal example branch from which they had actually been deleted) by right-clicking on the project and selecting Local History > Show History (and then Restore on the most recent history item I wanted). After Intellij restored the files in the "minimal example" branch, I pushed the branch to origin. Then I switched back to my "original" local branch and ran git pull origin minimalExample to get them back in the "original" branch too.
其他回答
如果你用过
git rm filename
然后删除一个文件
git checkout path/to/filename
不管用，在这种情况下
git checkout HEAD^ path/to/filename
应该工作
对我来说，什么工作是git签出{SHA1的版本提交恢复}"{路径文件恢复}"
例如git校验5a6b3179e58edff9c90326b9a04284b02fd67bd0 "src-ui/views/includes/radar.pug"
(在我们想要文件进入的分支中执行)
该命令执行后，恢复的文件将存在于原始位置(需要提交)
下面是在我的mac上帮助我的命令。我尝试了其他一些解决方案，但它们对我不起作用。
OSX Mavericks上的Git版本
mac-pro:main chris$ git version
git version 1.8.5.2 (Apple Git-48)
命令
git checkout HEAD -- path/to/file/file.cc
我也遇到了同样的问题，但上面的解决方案都不适合我。 我最后做的是: —创建同名的空文件 -将该文件与本地历史文件进行比较 -将历史记录复制到空文件。
在寻找如何从另一个分支合并后在我的工作目录中删除文件的答案时发现了这篇文章。合并后尚未作出任何承诺。 因为它是一个正在进行的合并，我不能只是添加它回来使用:
$ git reset <commitid#-where-file.cpp-existed> file.cpp
我不得不做另一个步骤，除了重置文件回来:
$ git checkout -- file.cpp
