git reset --merge HEAD~1

git reset --hard HEAD~1

​

//if no conflict and merge completed then:

git reset --hard HEAD~1

​

//if while doing a merge got conflict then abort will take you out of the recent merge changes:

git merge --abort

​

//or if you want to revert back to a specific commit id.

git reset --hard <commit-id>

git reset --merge ORIG_HEAD

git revert -m 1 <merge-commit>

​

git reset --merge origin/master

git revert -m 1 commit_hash

​

git reset --hard HEAD~1

git reset --hard <commit_sha>

git reset --hard HEAD~1

# to go back to merged verson:

git reset --hard ORIG_HEAD

​

$ git reset --hard <commit-before-merge>