git——撤销某次提交:reflog & revert
1.查询提交记录。进入目录,查看某人在此目录下的commit:
1 2 | panxi@ww-bj-panxi MINGW64 [path] /Business (feature /v2 .3) $ git log feature /v2 .3 --author=[pan] -- ./ |
2.根据提交的commit,撤销某次具体的commit(注意切换分支至目标分支):
1 | git revert 94d26b9c189497c6cda72dffb0c9afee6cb8fb96 |
3.撤销本地merge(原文链接:Undo a Git merge that hasn't been pushed yet)
With git reflog
check which commit is one prior the merge (git reflog
will be a better option than git log
). Then you can reset it using:
git reset --hard commit_sha
There's also another way:
git reset --hard HEAD~1
It will get you back 1 commit.
Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes away or see --merge
option below.
As @Velmont suggested below in his answer, in this direct case using:
git reset --hard ORIG_HEAD
might yield better results, as it should preserve your changes. ORIG_HEAD
will point to a commit directly before merge has occurred, so you don't have to hunt for it yourself.
A further tip is to use the --merge
switch instead of --hard
since it doesn't reset files unnecessarily:
git reset --merge ORIG_HEAD
--merge
Resets the index and updates the files in the working tree that are different between <commit> and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added).
【推荐】编程新体验,更懂你的AI,立即体验豆包MarsCode编程助手
【推荐】凌霞软件回馈社区,博客园 & 1Panel & Halo 联合会员上线
【推荐】抖音旗下AI助手豆包,你的智能百科全书,全免费不限次数
【推荐】博客园社区专享云产品让利特惠,阿里云新客6.5折上折
【推荐】轻量又高性能的 SSH 工具 IShell:AI 加持,快人一步
· 没有源码,如何修改代码逻辑?
· 一个奇形怪状的面试题:Bean中的CHM要不要加volatile?
· [.NET]调用本地 Deepseek 模型
· 一个费力不讨好的项目,让我损失了近一半的绩效!
· .NET Core 托管堆内存泄露/CPU异常的常见思路
· 微软正式发布.NET 10 Preview 1:开启下一代开发框架新篇章
· DeepSeek R1 简明指南:架构、训练、本地部署及硬件要求
· 没有源码,如何修改代码逻辑?
· NetPad:一个.NET开源、跨平台的C#编辑器
· 面试官:你是如何进行SQL调优的?
2017-08-16 大数据简介