Only attempt this if you haven't pushed yet.
git rebase --onto HEAD~2 HEAD~1 HEAD git cherry-pick ORIG_HEAD~1 git log -1
Copy the the <SHA1>.
git checkout master git reset --hard <SHA1>