我删除了一些文件。
我还没有承诺。
我想重置我的工作空间来恢复文件。
我做了一个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?
当前回答
以下是不同的案例，供大家参考:
如果没有提交删除，下面的命令将在工作树中恢复已删除的文件。
$ git checkout -- <file>
您可以使用下面的命令获得工作树中所有已删除文件的列表。
$ git ls-files --deleted
如果已提交删除，则查找发生删除的提交位置，然后从该提交中恢复文件。
#find the commit hash where it had this file deleted
$ git rev-list -n 1 HEAD -- <file>
它会给你一些类似c46e81aa403ecb8a0f7a323a358068345的东西，现在使用这个提交哈希和父操作符(^)，如下所示:
$ git checkout <commit>^ -- <file>
例子:
$ git checkout c46e81aa403ecb8a0f7a323a358068345^ -- <file>
如果您正在寻找要恢复的文件的路径，下面的命令将显示所有已删除文件的摘要。
$ git log --diff-filter=D --summary
如果你只想显示文件列表:
git log --diff-filter=D --summary | grep "delete mode"
其他回答
我也遇到了同样的问题，但上面的解决方案都不适合我。 我最后做的是: —创建同名的空文件 -将该文件与本地历史文件进行比较 -将历史记录复制到空文件。
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签出{SHA1的版本提交恢复}"{路径文件恢复}"
例如git校验5a6b3179e58edff9c90326b9a04284b02fd67bd0 "src-ui/views/includes/radar.pug"
(在我们想要文件进入的分支中执行)
该命令执行后，恢复的文件将存在于原始位置(需要提交)
输出告诉您需要做什么。git重置HEAD cc.properties等。
这将取消rm操作。在此之后，再次运行git状态会告诉您需要执行git checkout——cc.properties来取回文件。
更新: 我的配置文件中有这个
$ git config alias.unstage
reset HEAD
我通常用它来取消舞台上的东西
你已经进行了删除，所以你需要做:
git checkout HEAD cc.properties store/README store/cc.properties
Git结帐。仅从已经执行删除操作的索引中检出。
