I've merged a master branch from a friend's repository into my working directory into branch_a using:
git pull my_friend master
I've discovered that the merged version has errors. To continue development I would like to revert to my last commit before the merge.
I tried:
git reset --hard HEAD
But that brought me back to the state right after the merge. (does pull command commit?!)
I also tried:
git revert HEAD
but received the following error:
fatal: Commit 2d72d8f367b987d8c16f5cb1a543a6886acdcf83 is a merge but no -m option was given.
What should I do?