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

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.csdn.net/hudashi/article/details/7664460

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

Git冲突：Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
在pull Git仓库里最新代码时提示这个冲突:Your local changes would be overwritten by merge. Commit, stash or revert th ...
git pull 报错 Your local changes would be overwritten by merge. Commit, stash or revert them to procee
git pull 拉取的时候报错 Your local changes would be overwritten by merge. Commit, stash or revert them to p ...
Git Rebase vs Merge, GIt Reset vs Revert
Git merge vs Rebase 构造场景如下: https://zhuanlan.zhihu.com/p/29682134?utm_source=wechat_session Git Rest ...
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
和同事一起使用git .今天pull时候出现这个提示. Your local changes would be overwritten by merge. Commit, stash or rever ...
Git详细使用大全- rebase, merge, switch, cherry-pick, tag
Git2.3 目录文章目录推荐阅读前言-各个版本控制工具对比集中式版本控制工具分布式Git Git分区工作流程 0.配置查看签名设置签名查看签名文件设置例子 1. 版本库与文件操作 ...
Git Pull Failed: CONFLICT (content): Merge conflict in camus-aggregator/camus-admin-web/src/main/web
今天使用idea+git提交项目的时候,我的操作过程是这样的commit -> pull 然后就在这个pull这出现了文件存在差异我就对差异文件进行了修改,之后我再次pull的时候就出现了这 ...
git egit 如何 revert恢复原来代码
egit中没有revert选项,因为在git术语中revert代表了再提交一次回退之前的提交(revert in git lingo means create a new commit to reve ...
三分钟教你学Git(二十七) - 修改多个commit
比如我们又一个历史提交A->B->C->D, 当前HEAD在D commit上,我们想要修改B,C commits,该怎么做呢? 我们知道用git commit --amend可以修 ...
解决git提交敏感信息(回退git版本库到某一个commit)
解决git提交敏感信息(回退git版本库到某一个commit) Fri 07 June 2013 git是一个很好的版本库, 现在很多人用它, 并在github上创建项目, 相信大家都有过将敏感信息提 ...

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

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

最新文章

热门文章