Recover from a bad push in StGit

[Robin Rosenberg <robin.rosenberg.lists@dewire.com>]

Hi,

I recently did some reordering of patches and goofed up (not totally, but 
anyway). I pushed a number of patches and forgot one in the middle resulting 
in a merge  conflict. Pop won't work since I have local changes from the 
conflict and I don't want to resolve the conflict either since I didn't mean 
to push the patch at that point.

Is there a simple way of undoing a bad push? 

In this case I had a fresh export do help me out so I could just delete the 
patches and re-import them again, but what if I didn't?

-- robin