详解git代码回滚

总有一天你会遇到下面的问题.

改完代码匆忙提交,上线发现有问题,怎么办? 赶紧回滚.
改完代码测试也没有问题,但是上线发现你的修改影响了之前运行正常的代码报错,必须回滚.

这些开发中很常见的问题,所以git的取消提交,回退甚至返回上一版本都是特别重要的.

大致分为下面2种情况:

1.没有push

这种情况发生在你的本地代码仓库,可能你add ,commit 以后发现代码有点问题,准备取消提交,用到下面命令

$ git reset [--soft | --mixed | --hard]

上面常见三种类型

–mixed

会保留源码,只是将git commit和index 信息回退到了某个版本.

$ git reset #默认是 --mixed 模式 
$ git reset --mixed  #等价于  git reset

–soft

保留源码,只回退到commit 信息到某个版本.不涉及index的回退,如果还需要提交,直接commit即可.

–hard

源码也会回退到某个版本,commit和index 都回回退到某个版本.(注意,这种方式是改变本地代码仓库源码)

当然有人在push代码以后,也使用 reset --hard 回退代码到某个版本之前,但是这样会有一个问题,你线上的代码没有变,线上commit,index都没有变,当你把本地代码修改完提交的时候你会发现权是冲突…..

所以,这种情况你要使用下面的方式

2.已经push

对于已经把代码push到线上仓库,你回退本地代码其实也想同时回退线上代码,回滚到某个指定的版本,线上,线下代码保持一致.你要用到下面的命令

$ git revert

git revert用于反转提交,执行evert命令时要求工作树必须是干净的.
git revert用一个新提交来消除一个历史提交所做的任何修改.

revert 之后你的本地代码会回滚到指定的历史版本,这时你再 git push 既可以把线上的代码更新.(这里不会像reset造成冲突的问题)

revert 使用,需要先找到你想回滚版本唯一的commit标识代码,可以用 git log 或者web环境历史提交记录里查看.

$ git revert c011eb3c20ba6fb38cc94fe5a8dda366a3990c61     #通常,前几位即可
$ git revert c011eb3

git revert是用一次新的commit来回滚之前的commit，git reset是直接删除指定的commit

看似达到的效果是一样的,其实完全不同.

上面我们说的如果你已经push到线上代码库, reset 删除指定commit以后,你git push可能导致一大堆冲突.但是revert 并不会.
如果在日后现有分支和历史分支需要合并的时候,reset 恢复部分的代码依然会出现在历史分支里.但是revert 方向提交的commit 并不会出现在历史分支里.
reset 是在正常的commit历史中,删除了指定的commit,这时 HEAD 是向后移动了,而 revert 是在正常的commit历史中再commit一次,只不过是反向提交,他的 HEAD 是一直向前的.

分类： Git

标签：git

93 条评论

bd3333bat · 2026-07-26 00:26

The bonuses here are actually usable and not just for show. I managed to hit a nice win on my first try. Highly impressed with bd3333bat

juanbingophapk · 2026-07-26 00:26

The app version is just brilliant. I can play my favorite games on the go without any glitches. If you are in PH, you need to try juanbingophapk

livesport888 · 2026-07-26 00:27

Best place for live sports betting. The updates are instant and the betting options are huge. I always use livesport888 for my weekend matches

n52game · 2026-08-17 18:31

Scoured several review sites before making the switch and this place kept showing up as a top pick. The game variety is impressive and cashouts are processed without unnecessary delays. n52game

pgkinglogin · 2026-08-17 18:31

I stick to this site because the game updates are consistent and the jackpots actually pay out on schedule. The VIP program feels rewarding without being too aggressive. Head over to pgkinglogin and see what I mean

ecmarsbahis · 2026-08-17 18:31

I have been betting on live sports for years and this site finally matches the speed I expect from a modern platform. The match tracker updates in real time and the cashout options give me control right when the game shifts. Payments are processed without any hidden fees which keeps my bankroll healthy. A trustworthy home for fans who want seamless action and genuine value. ecmarsbahis

mwc · 2026-09-26 12:27

[8009]mwc লগইন ও অ্যাপ ডাউনলোড | অনলাইন স্লট গেম সাইট,mwc লগইন করে সেরা অনলাইন স্লট গেম সাইটের অভিজ্ঞতা নিন। বিকাশ দিয়ে ক্যাসিনো ডিপোজিট এবং লাইভ ক্যাসিনো খেলার নিয়ম জানতে আজই অ্যাপ ডাউনলোড করুন। visit: mwc

web site · 2026-09-28 19:47

Monster cock blow job picsVintage trucks for sale coeExcotic sexFree online male gay sexBook breast feeding
searsKayla synz porn trailorsScreaming cock fuckedSexy new year greeting cardDaughter porn vids daddyNew
vintage festival xnxx 88 – 90 ford escort gtPorn shitting siteOrgy
candyass vinylFree naked girl amatuer pics siteInstructor fucks profSunny
leone forst hardcoreVery young girl models eroticaRussian date sexyFree british porn girlsFree ruby knox porn pictures https://amp.xnxxtubexxx.cc/ Adult entertainment store
locatorsGwenth nudeMom catches daughter fucking boy friendCheerleaders naked in showerHigh boots
sex100 lesbo muffVaginal internal camsNude spring summer clothesPussy galore bond
costumeFacial cum shot videos xnxx Breast
enhancer siliconThumb experiment scientific methodFuck
the world movieGuild vintage western leather jacketBest free porn downloadSophie dee
ass masterpieceItalian porn star gallery

gamephlogin · 2026-10-05 21:12

Hey guys! Just wanted to share my experience with gamephlogin. Super easy to use, and the login process is a breeze. Definitely recommend checking it out! gamephlogin