git checkout not discard changes

最新推荐文章于 2024-09-26 19:03:00 发布

转载最新推荐文章于 2024-09-26 19:03:00 发布 · 588 阅读

0 ·

CC 4.0 BY-SA版权

原文链接：http://www.cnblogs.com/hfyinsdu/p/3725591.html

文章标签：

#git

博客记录了使用Git时的操作过程。先切换到master分支并查看状态，发现testfile.c文件有修改但未暂存；查看差异无结果；尝试检出修改文件，状态仍未改变；最后通过git add testfile.c解决问题，使工作目录变干净。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

1. checkout one branch, show status

user@vbox:/mnt/tmp$ git checkout master
Switched to branch 'master'
user@vbox:/mnt/tmp$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   testfile.c
#
no changes added to commit (use "git add" and/or "git commit -a")

2. show diff, turns out no diff
user@vbox:/mnt/tmp$ git diff

user@vbox:/mnt/tmp$

3. checkout modified file, show status, testfile.c doesn't change.

user@vbox:/mnt/tmp$ git checkout -- testfile.c

user@vbox:/mnt/tmp$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   testfile.c
#
no changes added to commit (use "git add" and/or "git commit -a")

4. solution. Don't know why, but this works for me.
user@vbox:/mnt/tmp$ git add testfile.c
user@vbox:/mnt/tmp$ git status
# On branch master
nothing to commit, working directory clean
user@vbox:/mnt/tmp$

转载于:https://www.cnblogs.com/hfyinsdu/p/3725591.html