Why does git revert complain about a missing -m option?

by

By default git revert refuses to revert a merge commit as what that actually means is ambiguous. I presume that your HEAD is in fact a merge commit.

If you want to revert the merge commit, you have to specify which parent of the merge you want to consider to be the main trunk, i.e. what you want to revert to.

Often this will be parent number one, for example if you were on master and did git merge unwanted and then decided to revert the merge of unwanted. The first parent would be your pre-merge master branch and the second parent would be the tip of unwanted.

In this case you could do:

git revert -m 1 HEAD

git cat-file -p [MERGE_COMMIT_ID] will show the parent branches in order. The first one listed would be -m 1, the second -m 2.

More Related Contents:

  1. How to determine the URL that a local Git repository was originally cloned from?
  2. SSL certificate rejected trying to access GitHub over HTTPS behind firewall
  3. Git Init in home directory – now unable to commit changes
  4. Does github remember commit IDs?
  5. Is it possible to include a file in your .gitconfig
  6. Git – remote: Repository not found
  7. How to disable osxkeychain as credential helper in git config?
  8. Merging between forks in GitHub
  9. How can I fetch an unmerged pull request for a branch I don’t own?
  10. Having Trouble Switching Github accounts on terminal
  11. How to compare two different commits on the same branch in github?
  12. Repository size limits for GitHub.com
  13. Push to GitHub error: Couldn’t find host github.com in the .netrc file; using defaults
  14. How do I add an existing Solution to GitHub from Visual Studio 2013
  15. Visual Studio Code is always asking for Git credentials
  16. The unauthenticated git protocol on port 9418 is no longer supported
  17. Git branch name – case sensitive or insensitive?
  18. Renaming a branch in GitHub
  19. Push and pull my conda environment using git
  20. how to log out of one Github account and use another account?
  21. How do I fix “remote: fatal error in commit_refs” errors trying to push with Git?
  22. GitHub Clone with OAuth Access Token
  23. Git Clone – Repository not found
  24. Git: How to make outer repository and embedded repository work as common/standalone repository?
  25. Git push error: RPC failed; result=56, HTTP code = 200 fatal: The remote end hung up unexpectedly fatal
  26. GitHub pages only showing ReadMe file?
  27. Clone only the .git directory of a git repo
  28. How to push different local Git branches to Heroku/master
  29. git – remote add origin vs remote set-url origin
  30. git clone with HTTPS or SSH remote?

Leave a Comment