git revert --abort
git reset --soft HEAD^ // discard the last commit, keeping all the changes after that