I stashed some local changes before doing a complicated merge, did the merge, then stupidly forgot to commit before running `git stash pop`. The pop created some problems (bad method calls in a big codebase) that are proving hard to track down. I ran `git stash show`, so I at least know which files were changed. If nothing else, I guess this is a lesson to commit more.

My question: is it possible to undo the stash pop without also undoing the merge?