如何将git文件还原到其临时区域版本？

Question

假设我有一个名为的文件a.txt.我将它添加到临时区域,然后我修改它.我怎么能把它恢复到我添加它的时候呢？

Answer 1

git checkout a.txt

如果你输入,Git会告诉你git status:

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   a
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   a
#

Answer 2

git checkout -- a.txt

这个页面上的另一个答案没有--,并导致一些混乱.

这是Git在您输入时告诉您的内容git status:

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   a
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   a
#