How to recover a dropped stash in Git?

stash_dropped.md

How to recover a dropped stash in Git?

1. Find the stash commits

git log --graph --oneline --decorate ( git fsck --no-reflog | awk '/dangling commit/ {print $3}' )

This will show you all the commits at the tips of your commit graph which are no longer referenced from any branch or tag – every lost commit, including every stash commit you’ve ever created, will be somewhere in that graph.

bash/sh shell users: Version above is for Fish shell, so if you are Bash/SH user just add a $ sign before to the left parenthesis.

2. Once you know the hash of the commit you want, you can apply it as a stash

git stash apply YOUR_WIP_COMMIT_HASH_HERE

Note: The commit message will only be in this form (starting with "WIP on") if you did not supply a message when you did git stash.

Source: View the complete answer at https://stackoverflow.com/a/91795/2510591

3. If your stash commit is not listed or you don't find it (optional)

If your stash was already applied but you don't see it, for example after resolving a conflict or reset. Follow these steps:

• Run git fsck --no-reflog | awk '/dangling commit/ {print $3}'
• Pick a stash commit hash and use git show COMMIT_HASH in order to examine the stash commit diff of your changes.
• After found your changes just use the corresponding commit of your stash changes and then just apply it using git stash apply COMMIT_HASH.

Bonus

If you are Fish shell user, you can take a look at GitNow which is a tool to perform faster Git operations and that can also stash your changes for you.

POH TIOZAO TU SALVOU MINHA VIDA
OH BIG Brow, you saved my life

THANK YOU!

Thanks! it's great

You just saved my life!

I believed I was going to die! Thank you so much.

It works! You saved my life!

Thanks a lot! Hours of work were saved. stash apply on commit also don't work for me - fatal: 'dab54e3' is not a stash-like commit, but cherry-pick works well

you saved my life 😍

saved my life..Thanks

Incredible

Saved my 3 days of work <3

thx

Saved my life man, thank you <3

Thanks a lot for this!!!

Thanks a lot for this, It saved my three days work !!!

OMG dude - you saved my sanity and work! Thank you, thank you.

Thanks a lot!

Thank you, you are better than ChatGPT

I usually user below command to recover my lost stash:

# get the lost stash and output to find.txt
git fsck --unreachable | awk '{print $3}' | xargs git show >> find.txt

# this command is powerful, you can find your change if you remember the changed content or file name
git log --graph --decorate --pretty=oneline --abbrev-commit --all $(git fsck --no-reflogs | grep commit | cut -d' ' -f3)

# once you get the correct hash, you can get the dropped stash via hash
git stash apply 95ccbd927ad4cd413ee2a28014c81454f4ede82c

Thank you!

Thank you for saving my time 🙏

git log --graph --oneline --decorate ( git fsck --no-reflog | awk '/dangling commit/ {print $3}' ) will give a zsh: bad pattern error in zshell. I don't recally why that happens. I solved the issue that I had a different way.

Its work not with lost stashes from 2019 :-(

I usually user below command to recover my lost stash:

# get the lost stash and output to find.txt
git fsck --unreachable | awk '{print $3}' | xargs git show >> find.txt

# this command is powerful, you can find your change if you remember the changed content or file name
git log --graph --decorate --pretty=oneline --abbrev-commit --all $(git fsck --no-reflogs | grep commit | cut -d' ' -f3)

# once you get the correct hash, you can get the dropped stash via hash
git stash apply 95ccbd927ad4cd413ee2a28014c81454f4ede82c

Thank you, you just saved a life

You saved me

I usually user below command to recover my lost stash:

# get the lost stash and output to find.txt
git fsck --unreachable | awk '{print $3}' | xargs git show >> find.txt

# this command is powerful, you can find your change if you remember the changed content or file name
git log --graph --decorate --pretty=oneline --abbrev-commit --all $(git fsck --no-reflogs | grep commit | cut -d' ' -f3)

# once you get the correct hash, you can get the dropped stash via hash
git stash apply 95ccbd927ad4cd413ee2a28014c81454f4ede82c

If you have this:

error: object hash is a tree, not a commit
fatal: 'hash' is not a stash-like commit

Only use the commit hash not the tree hash.

Thanks for this. S/O to the Git gods 🐐