SHELL

git rebase continue

Tag your latest commit (or just write down its SHA1 somewhere so you don't lose it): git tag temp
git rebase --abort
Do the rebase again. You'll have to resolve the merge again. :(
git rebase --continue
git cherry-pick temp