Aborting `git stash apply`

git git-stash
abernier picture abernier · Feb 11, 2012 · Viewed 36.7k times · Source

I regret having applied a stash (wrong branch). How can I undo this and have my stash back to my stash list in order to apply it later on the right branch?

Answer

Brandan picture Brandan · Feb 11, 2012

If you haven't committed, you should just be able to git stash again, possibly with a git reset HEAD first.

Also, git stash apply doesn't delete the stash like git stash pop does. So if you have committed, you could git reset --hard [last_good_commit] (if you haven't pushed) or git revert [last_good_commit] (if you have pushed) and just apply the stash again once you're on the right branch.

Note: Running git reset --hard will delete any uncommitted code.

Related questions

Stash only one file out of multiple files that have changed with Git?

How can I stash only one of multiple changed files on my branch?

Read More
How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?

How do I ignore the following error message on Git pull? Your local changes to the following files would be overwritten by merge What if I want to overwrite them? I've tried things like git pull -f, but nothing works. …

Read More
See what's in a stash without applying it

I see here you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

Read More