我删除了一些文件。
我还没有承诺。
我想重置我的工作空间来恢复文件。
我做了一个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 -- .
在你做出承诺之前。
您可能还希望删除尚未创建的已创建文件。你不想要他们。:
git reset -- .
其他回答
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(我的是2.27.0)更友好，实际的命令会在“git状态”中显示。 例如，如果您删除了文件tf.c，那么
$ git status
...
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: tf.c
你可以使用“git restore tf.c”来恢复它，就像它saz一样。不要再搜索了!
使用git ls-files签出删除(-d)或修改(-m)的文件。
git checkout $(git ls-files -d)
参见如何仅恢复git签出上修改的文件?
自动地一次性恢复所有未分级的删除，而不指定每一个路径:
git ls-files -z -d | xargs -0 git checkout --
自动地一次性恢复所有的阶段性删除，而不指定每一个路径:
git status | grep 'deleted:' | awk '{print $2}' | xargs git checkout --
输出告诉您需要做什么。git重置HEAD cc.properties等。
这将取消rm操作。在此之后，再次运行git状态会告诉您需要执行git checkout——cc.properties来取回文件。
更新: 我的配置文件中有这个
$ git config alias.unstage
reset HEAD
我通常用它来取消舞台上的东西
