recentpopularlog in

Copy this bookmark:





to read

bookmark detail

version control - Aborting a merge in Git - Stack Overflow [http://stackoverflow.com/]
Since your pull was unsuccessful then just HEAD is the last "valid" commit on your branch (not HEAD^):

git reset --hard HEAD
git  whenthingsgowrong  merge  abortabort  solution 
july 2014 by kme
view in context