1.未 git add 的修改
先在在 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 查看一下:
$ 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")
可以發(fā)現(xiàn)杠河,Git 會告訴你副砍,git checkout -- file 可以丟棄工作區(qū)的修改:
$ git checkout -- readme.txt
命令 git checkout -- readme.txt 意思就是顾孽,把 readme.txt 文件在工作區(qū)的修改全部撤銷咒锻,這里有兩種情況:
一種是 readme.txt 自修改后還沒有被放到暫存區(qū),現(xiàn)在催跪,撤銷修改就回到和版本庫一模一樣的狀態(tài)锁蠕;
一種是 readme.txt 已經(jīng)添加到暫存區(qū)后,又作了修改懊蒸,現(xiàn)在荣倾,撤銷修改就回到添加到暫存區(qū)后的狀態(tài)。
總之骑丸,就是讓這個文件回到最近一次 git commit 或 git add 時的狀態(tài)舌仍。
2.已 git add 的修改
假如修改了 readme.txt妒貌,并且執(zhí)行了 git add 命令:
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 add readme.txt
現(xiàn)在該怎么撤回修改呢?我們先用 git status 查看一下铸豁,修改只是添加到了暫存區(qū)灌曙,還沒有提交:
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: readme.txt
Git 同樣告訴我們,用命令 git reset HEAD file 可以把暫存區(qū)的修改撤銷掉(unstage)节芥,重新放回工作區(qū):
$ git reset HEAD readme.txt
Unstaged changes after reset:
M readme.txt
git reset 命令既可以回退版本在刺,也可以把暫存區(qū)的修改回退到工作區(qū)。當我們用 HEAD 時头镊,表示最新的版本蚣驼。
再用 git status 查看一下,現(xiàn)在暫存區(qū)是干凈的相艇,工作區(qū)有修改:
$ 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")
最后我們撤回工作區(qū)的修改:
$ git checkout -- readme.txt