git的使用(四)

$ cat readme.txt
Git is a distributed  version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
My stupid boss still prefers SVN.                    #把在工作区readme.txt文件中增加了一行

$ 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:   readme.txt

no changes added to commit (use "git add" and/or "git commit -a")

$ git diff readme.txt                                   #查看文件内容是否是自己需要的
diff --git a/readme.txt b/readme.txt
index d5e8dad..921e20a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,5 @@
 Git is a distributed  version control system.
 Git is free software distributed under the GPL.
 Git has a mutable index called stage.
-Git tracks changes.
+Git tracks changes of files.
+My stupid boss still prefers SVN.                       #发现这一内容是不能提交的（对boss不满，boss会记住的，你懂的

$ cat readme.txt
Git is a distributed  version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
My stupid boss still prefers SVN.                    #这是刚才添加的一行  未提交到暂存区（中转站）

$ git checkout -- readme.txt              #撤销更改，即撤销添加的My stupid boss still prefers SVN. 这一行


$ cat readme.txt                                     #查看撤销后的文本内容
Git is a distributed  version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes.

$ cat readme.txt
Git is a distributed  version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
My stupid boss still prefers SVN.                  #这是刚才添加的一行 

$ 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:   readme.txt                        #查询进行第一次修改

no changes added to commit (use "git add" and/or "git commit -a")


$ git add readme.txt                                 #

$ git status                                        #查看当前状态
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)        #提示：如果要将暂存区的文本版本回退到工作区，使用git reset HEAD <file>

        modified:   readme.txt                       #第一次修改文本并add到暂存区

$ git reset HEAD readme.txt                         #将暂存区的文本版本回退到工作区  即回退到add之前的状态，add之前的状态是进行的第一次修改
Unstaged changes after reset:
M       readme.txt


$ 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:   readme.txt

$ git diff                                            #验证是不是停留在了第一次修改的位置。第一次修改添加了一行信息：My stupid boss still prefers SVN.
diff --git a/readme.txt b/readme.txt
index d5e8dad..a60e297 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,3 +2,4 @@ Git is a distributed  version control system.
 Git is free software distributed under the GPL.
 Git has a mutable index called stage.
 Git tracks changes.
+My stupid boss still prefers SVN

$ git checkout -- readme.txt             #撤销第一次的修改


$ git status                             #文本文件的版本已经恢复到最开始的版本，工作区干净，暂存区也是干净的
On branch master
nothing to commit, working directory clean

$ cat readme.txt                          #回到了最初的那个文本文件内容
Git is a distributed  version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes.