git revert 詳解

工作中難免會遇到一些commit需要回退舵抹，可以用reset和revert。

reset是回朔到指定的commit版本竭讳，指定的commit版本之后的操作commit都重置了支子。revert是刪除指定的commit操作的內(nèi)容，指定的commit之前和之后commit操作都不受影響迎献，與此同時這個操作也會作為一個commit進行提交瞎访。

但對于已經(jīng)提交到遠端的公共分支比如master上的commit只能用revert來進行回退操作，具體用法如下所示：

這是當前工作區(qū)域log的情況

bash-3.2$ git log
commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:18 2017 +0800

    add e.go

commit 6a307a975fa676954c61078a3d786ef4ba084fd1
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:02 2017 +0800

    add d.go

commit 0bf71363290e8db926d442234eefb4cee2b3fdc8
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:41 2017 +0800

    add c.go

commit 6a2cc3dd8385004a5b9145630cb0b67498155c6b
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:23 2017 +0800

    add b.go

commit d672cd988198d3aec6faaccf0e39ab38e2304d19
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go

commit 2405994636350db65ec02adcbb3a6f356140b075
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:13 2017 +0800

    Create README.md

commit a432247e2acad106b7386d610df21ee1afbeaac6
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:03 2017 +0800

    Initial commit

1.比如你當前想回退某個commit

比如如下commit

commit d672cd988198d3aec6faaccf0e39ab38e2304d19
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go

方式一：bash-3.2$ git revert HEAD~4

用法：當前commit為HEAD吁恍，然后每一個commit加一得到要撤銷的commit 為HEAD~4

commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2  HEAD
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:18 2017 +0800

    add e.go

commit 6a307a975fa676954c61078a3d786ef4ba084fd1   HEAD~1
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:02 2017 +0800

    add d.go

commit 0bf71363290e8db926d442234eefb4cee2b3fdc8   HEAD~2
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:41 2017 +0800

    add c.go

commit 6a2cc3dd8385004a5b9145630cb0b67498155c6b   HEAD~3
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:23 2017 +0800

    add b.go

commit d672cd988198d3aec6faaccf0e39ab38e2304d19   HEAD~4
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go

方式二：bash-3.2$ git revert d672cd988198d3aec6faaccf0e39ab38e2304d19 或者 git revert d672cd9

用法： git revert + 完整的commit或者該commit前7位即可

bash-3.2$ git log
commit 3c149a450e2b86218a588423e116ee678acc2514
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 15:04:37 2017 +0800

    Revert "add a.go"

    This reverts commit d672cd988198d3aec6faaccf0e39ab38e2304d19.

commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:18 2017 +0800

    add e.go

commit 6a307a975fa676954c61078a3d786ef4ba084fd1
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:02 2017 +0800

    add d.go

commit 0bf71363290e8db926d442234eefb4cee2b3fdc8
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:41 2017 +0800

    add c.go

commit 6a2cc3dd8385004a5b9145630cb0b67498155c6b
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:23 2017 +0800

    add b.go

commit d672cd988198d3aec6faaccf0e39ab38e2304d19
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go

2.回退連續(xù)的幾個commit扒秸，這種情況比較常見

比如回退最新的三個commit：`HEAD,HEAD~1,HEAD~2`

commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2   HEAD
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:18 2017 +0800

    add e.go

commit 6a307a975fa676954c61078a3d786ef4ba084fd1   HEAD~1
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:02 2017 +0800

    add d.go

commit 0bf71363290e8db926d442234eefb4cee2b3fdc8   HEAD~2
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:41 2017 +0800

    add c.go

commit 6a2cc3dd8385004a5b9145630cb0b67498155c6b   HEAD~3
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:23 2017 +0800

    add b.go

commit d672cd988198d3aec6faaccf0e39ab38e2304d19   HEAD~4
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go
    
commit 2405994636350db65ec02adcbb3a6f356140b075   HEAD~5
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:13 2017 +0800

    Create README.md

commit a432247e2acad106b7386d610df21ee1afbeaac6   HEAD~6
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:03 2017 +0800

    Initial commit

比如最新的三個commit有問題需要回退 `git revert X...Y`

用法： X...Y 代表一個左開右閉區(qū)間(X,Y],不包括X,包括Y. 其中Y為起點commit，X為終點commit的下一個commit

方式一：
bash-3.2$：git revert HEAD~3...HEAD

方式二：
git revert 6a2cc3d...6a43ed0

或者

git revert 6a2cc3dd8385004a5b9145630cb0b67498155c6b...6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2

結(jié)果如下：

bash-3.2$ git log
commit af4076c5fe336d877ec36d1580c8b153400981c4
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 15:45:43 2017 +0800

    Revert "add c.go"

    This reverts commit 0bf71363290e8db926d442234eefb4cee2b3fdc8.

commit 9cee5e52f1b4e5a2c3fe8e697c5dda6a844fe923
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 15:45:40 2017 +0800

    Revert "add d.go"

    This reverts commit 6a307a975fa676954c61078a3d786ef4ba084fd1.

commit a75fce274472132cf59f24a7bfb11a8c47295987
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 15:45:38 2017 +0800

    Revert "add e.go"

    This reverts commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2.

commit 6a43ed02f5831c9b91df9ae0dbfb9561d1ec2bb2
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:18 2017 +0800

    add e.go

commit 6a307a975fa676954c61078a3d786ef4ba084fd1
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:55:02 2017 +0800

    add d.go

commit 0bf71363290e8db926d442234eefb4cee2b3fdc8
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:41 2017 +0800

    add c.go

commit 6a2cc3dd8385004a5b9145630cb0b67498155c6b
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:54:23 2017 +0800

    add b.go

commit d672cd988198d3aec6faaccf0e39ab38e2304d19
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:53:00 2017 +0800

    add a.go

commit 2405994636350db65ec02adcbb3a6f356140b075
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:13 2017 +0800

    Create README.md

commit a432247e2acad106b7386d610df21ee1afbeaac6
Author: asturelizhe <asturelizhe@163.com>
Date:   Sun Apr 23 14:51:03 2017 +0800

    Initial commit

最后編輯于：2017.12.07 00:27:21

?著作權(quán)歸作者所有,轉(zhuǎn)載或內(nèi)容合作請聯(lián)系作者

人面猴
序言：七十年代末冀瓦，一起剝皮案震驚了整個濱河市伴奥，隨后出現(xiàn)的幾起案子，更是在濱河造成了極大的恐慌咕幻，老刑警劉巖渔伯，帶你破解...
沈念sama閱讀 217,542評論 6贊 504
死咒
序言：濱河連續(xù)發(fā)生了三起死亡事件，死亡現(xiàn)場離奇詭異肄程，居然都是意外死亡锣吼，警方通過查閱死者的電腦和手機，發(fā)現(xiàn)死者居然都...
沈念sama閱讀 92,822評論 3贊 394
救了他兩次的神仙讓他今天三更去死
文/潘曉璐我一進店門蓝厌，熙熙樓的掌柜王于貴愁眉苦臉地迎上來玄叠，“玉大人，你說我怎么就攤上這事拓提《潦眩” “怎么了？”我有些...
開封第一講書人閱讀 163,912評論 0贊 354
道士緝兇錄：失蹤的賣姜人
文/不壞的土叔我叫張陵代态，是天一觀的道長寺惫。經(jīng)常有香客問我，道長蹦疑，這世上最難降的妖魔是什么西雀？我笑而不...
開封第一講書人閱讀 58,449評論 1贊 293
?港島之戀（遺憾婚禮）
正文為了忘掉前任，我火速辦了婚禮歉摧，結(jié)果婚禮上艇肴，老公的妹妹穿的比我還像新娘腔呜。我一直安慰自己，他們只是感情好再悼，可當我...
茶點故事閱讀 67,500評論 6贊 392
惡毒庶女頂嫁案：這布局不是一般人想出來的
文/花漫我一把揭開白布核畴。她就那樣靜靜地躺著，像睡著了一般冲九。火紅的嫁衣襯著肌膚如雪谤草。梳的紋絲不亂的頭發(fā)上，一...
開封第一講書人閱讀 51,370評論 1贊 302
城市分裂傳說
那天莺奸，我揣著相機與錄音咖刃，去河邊找鬼。笑死憾筏，一個胖子當著我的面吹牛嚎杨，可吹牛的內(nèi)容都是我干的。我是一名探鬼主播氧腰，決...
沈念sama閱讀 40,193評論 3贊 418
雙鴛鴦連環(huán)套：你想象不到人心有多黑
文/蒼蘭香墨我猛地睜開眼枫浙，長吁一口氣：“原來是場噩夢啊……” “哼！你這毒婦竟也來了古拴？” 一聲冷哼從身側(cè)響起箩帚，我...
開封第一講書人閱讀 39,074評論 0贊 276
萬榮殺人案實錄
序言：老撾萬榮一對情侶失蹤，失蹤者是張志新（化名）和其女友劉穎黄痪，沒想到半個月后紧帕，有當?shù)厝嗽跇淞掷锇l(fā)現(xiàn)了一具尸體，經(jīng)...
沈念sama閱讀 45,505評論 1贊 314
?護林員之死
正文獨居荒郊野嶺守林人離奇死亡桅打，尸身上長有42處帶血的膿包…… 初始之章·張勛以下內(nèi)容為張勛視角年9月15日...
茶點故事閱讀 37,722評論 3贊 335
?白月光啟示錄
正文我和宋清朗相戀三年是嗜，在試婚紗的時候發(fā)現(xiàn)自己被綠了。大學(xué)時的朋友給我發(fā)了我未婚夫和他白月光在一起吃飯的照片挺尾。...
茶點故事閱讀 39,841評論 1贊 348
活死人
序言：一個原本活蹦亂跳的男人離奇死亡鹅搪，死狀恐怖，靈堂內(nèi)的尸體忽然破棺而出遭铺，到底是詐尸還是另有隱情丽柿，我是刑警寧澤，帶...
沈念sama閱讀 35,569評論 5贊 345
?日本核電站爆炸內(nèi)幕
正文年R本政府宣布魂挂，位于F島的核電站甫题，受9級特大地震影響，放射性物質(zhì)發(fā)生泄漏涂召。R本人自食惡果不足惜坠非，卻給世界環(huán)境...
茶點故事閱讀 41,168評論 3贊 328
男人毒藥：我在死后第九天來索命
文/蒙蒙一、第九天我趴在偏房一處隱蔽的房頂上張望芹扭。院中可真熱鬧麻顶，春花似錦、人聲如沸舱卡。這莊子的主人今日做“春日...
開封第一講書人閱讀 31,783評論 0贊 22
一樁弒父案，背后竟有這般陰謀
文/蒼蘭香墨我抬頭看了看天上的太陽轮锥。三九已至矫钓，卻和暖如春，著一層夾襖步出監(jiān)牢的瞬間舍杜，已是汗流浹背新娜。一陣腳步聲響...
開封第一講書人閱讀 32,918評論 1贊 269
情欲美人皮
我被黑心中介騙來泰國打工，沒想到剛下飛機就差點兒被人妖公主榨干…… 1. 我叫王不留既绩，地道東北人概龄。一個月前我還...
沈念sama閱讀 47,962評論 2贊 370
代替公主和親
正文我出身青樓，卻偏偏與公主長得像饲握，于是被迫代替她去往敵國和親私杜。傳聞我的和親對象是個殘疾皇子，可洞房花燭夜當晚...
茶點故事閱讀 44,781評論 2贊 354