git - 撤消Git中一个文件的工作副本修改？(Undo working copy modifications of one file in Git?)

Question

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit.

(在最后一次提交之后，我修改了工作副本中的一堆文件，但是我想撤消对这些文件之一的更改，例如将其重置为与最新提交相同的状态。)

However, I only want to undo the working copy changes of just that one file alone, nothing else with it.

(但是，我只想撤消仅一个文件的工作副本更改，而没有其他操作。)

How do I do that?

(我怎么做？)

  ask by hasen translate from so

Answer 1

You can use

(您可以使用)

git checkout -- file

You can do it without the -- (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using -- is best.

(您可以在不使用--情况下执行此操作（如nimrodm所建议），但是如果文件名看起来像分支或标记（或其他修订标识符），则可能会感到困惑，因此最好使用-- 。)

You can also check out a particular version of a file:

(您还可以签出文件的特定版本：)

git checkout v1.2.3 -- file         # tag v1.2.3
git checkout stable -- file         # stable branch
git checkout origin/master -- file  # upstream master
git checkout HEAD -- file           # the version from the most recent commit
git checkout HEAD^ -- file          # the version before the most recent commit