Undoing accidental git stash pop

Question

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

User · Answer

If your merge was not too complicated another option would be to:

Move all the changes including the merge changes back to stash using "git stash"
Run the merge again and commit your changes (without the changes from the dropped stash)
Run a "git stash pop" which should ignore all the changes from your previous merge since the files are identical now.

After that you are left with only the changes from the stash you dropped too early.

User · Answer

Try using How to recover a dropped stash in Git  to find the stash you popped   I think there are always two commits for a stash  since it preserves the index and the working copy  so often the index commit will be empty    Then git show them to see the diff and use patch -R to unapply them

User · Answer

From git stash --help  Recovering stashes that were cleared dropped erroneously    If you mistakenly drop or clear stashes  they cannot be recovered through the normal safety mechanisms  However  you can try the    following incantation to get a list of stashes that are still in your repository  but not reachable any more          git fsck --unreachable          grep commit   cut -d   -f3          xargs git log --merges --no-walk --grep WIP   This helped me better than the accepted answer with the same scenario

[git] Undoing accidental git stash pop

Examples related to git

Examples related to git-stash