Reset and revert with GIT

Some commands that allow to go back in time with git.

Reset head to a commit (not pushed yet)

git reset --hard <commit_before_merge>

Revert a merged commit

git revert -m 1 <merge commit hash>

Source

https://stackoverflow.com/questions/11722533/rollback-a-git-merge