Revert a git cherry-pick

Copy the SHA of the cherry-pick you want to remove (NOT the SHA of the last commit you want to keep):

git rebase -p --onto SHA^ SHA

Easy-peasy.