如何还原合并提交？

Question

I accidentally merged my branch to master. Since then several commits has been pushed by other team members. How can I revert just the commit I merged accidentally.

git log: commit 5 commit 4 commit 3 commit 2(Accidental Merge branch ) commit 1

How to revert commit 2? I tried the command git revert

I get an error error: commit 9576fbad0f1dd6f09412d9c87411e3c79fc6c961 is a merge but no -m option was given.

Answer 1

use:

git revert 9576fbad0f1dd6f09412d9c87411e3c79fc6c961 -m 1

and don't forget to push you changes after that.

Read more