Rollback a Git merge

by

Reverting a merge commit has been exhaustively covered in other questions. When you do a fast-forward merge, the second one you describe, you can use git reset to get back to the previous state:

git reset --hard <commit_before_merge>

You can find the <commit_before_merge> with git reflog, git log, or, if you’re feeling the moxy (and haven’t done anything else): git reset --hard HEAD@{1}

More Related Contents:

  1. How can I specify a branch/tag when adding a Git submodule?
  2. git error: failed to push some refs to remote
  3. How to backup a local Git repository?
  4. Git: Installing Git in PATH with GitHub client for Windows
  5. Remove files from Git commit
  6. How do I remove files saying “old mode 100755 new mode 100644” from unstaged changes in Git?
  7. Git – fatal: Unable to create ‘/path/my_project/.git/index.lock’: File exists
  8. Resolve Git merge conflicts in favor of their changes during a pull
  9. Git and Mercurial – Compare and Contrast
  10. How do I get the Git commit count?
  11. How can I fix a corrupted Git repository?
  12. How to DEFLATE with a command line tool to extract a git object?
  13. How do I get the current branch name in Git?
  14. How do I see the differences between two branches?
  15. How does Git compute file hashes?
  16. What is the result of `git push origin`?
  17. Push origin master error on new repository
  18. How to list all Git tags?
  19. Git pre-receive hook
  20. How do I view all commits for a specific day?
  21. Visual Studio Git Source Control without Git for Windows or Github extension
  22. Username and password in command for git push
  23. “fetch –all” in a git bare repository doesn’t synchronize local branches to the remote ones
  24. fatal: does not appear to be a git repository
  25. working with .git/info/exclude too late
  26. Recover a commit sent as a pull-request from a deleted fork on GitHub
  27. Git not removing files when switching branch
  28. Force “git status” to output color on the terminal (inside a script)
  29. remote rejected master -> master (pre-receive hook declined)
  30. Difference between Git and Nexus?

Leave a Comment