Git: How to revert a merge commit that's already pushed to remote branch?

柏油路留不下脚印

于 2016-08-10 23:28:36 发布

阅读量503

点赞数

分类专栏： git 文章标签： git

本文链接：https://blog.youkuaiyun.com/wwq518/article/details/52177081

版权

git 专栏收录该内容

6 篇文章

订阅专栏

本文解释了如何使用Git的revert命令来撤销特定的合并提交。重点介绍了-m选项的作用，即指定父提交编号来确定要撤销的合并分支。通过具体例子说明了如何区分主分支和合并分支，帮助理解撤销合并的具体操作。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

git revert commit-hash-value alone won’t work. -m must be specified, and I’m pretty confused about it.

See details:
这里写图片描述

The -m option specifies the parent number. This is because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge.

When you view a merge commit in the output of git log, you will see its parents listed on the line that begins with Merge:
这里写图片描述

这里写图片描述

In this situation, git revert 4cb43c6 -m 1 will get you the tree as it was in 336a48b, and git revert 4cb43c6 -m 2 will reinstate the tree as it was in b75a5d7..

what is parent number?

links:
https://git-scm.com/blog/2010/03/02/undoing-merges.html
http://www.gitguys.com/topics/git-object-commit/

revert vs reset
http://yijiebuyi.com/blog/8f985d539566d0bf3b804df6be4e0c90.html
http://blog.youkuaiyun.com/hudashi/article/details/7664460