Git重置<文件>

无论您是否有任何以前的提交。

git reset filename.txt

如果在filename.txt中有修改，则是您错误地将其添加到stage，并且希望从staging中删除该文件，但又不想丢失所做的更改。

Git checkout——<文件>

它完美地从暂存区删除文件

我的示例:

$ git status
On branch feature/wildfire/VNL-425-update-wrong-translation
Your branch and 'origin/feature/wildfire/VNL-425-update-wrong-translation' have diverged,
and have 4 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   ShopBack/Source/Date+Extension.swift
    modified:   ShopBack/Source/InboxData.swift
    modified:   ShopBack/en.lproj/Localizable.strings

你们可能注意到了

> Changes to be committed:
>       (use "git reset HEAD <file>..." to unstage)

我想你可以选

Git恢复——staging <path/to/file_name>

当你执行git status时，git会告诉你如何取消运行:

Changes to be committed: (use "git reset HEAD <file>..." to unstage).

所以git重置HEAD <文件>为我工作，这些变化没有被触及。