Newbie question: Is it possible to undo a stash?

Hi,

I just did a git stash, and then changed my mind and ran git apply, thinking that would get me back to where I was...

Now I have lots of conflicting merges and files that came back from the dead (and some files seem lost)... I've been trying to go step by step to try to get the tree to where it was, but it's very complicated, so I was wondering if there is anything I can do to get my working tree exactly to where it was before I ran git stash...

Thanks!

"Iván V." <elterrible@ivanyvenian.com> writes:

You meant "git stash apply" here, didn't you?
 

To get your working tree and index to exact state as it was before git-stash, you have first to bring current HEAD to the state it was when you did the stash. So if you changed branch, you have to change it back; if you did any commits, you have to rewind (reset) it.

If the "base" state isn't the same as it was during "git stash", then "git stash apply" would have to do a merge... which can fail...

P.S. Please provide with the exact (best if minimal) sequence of commands, if you want for us to dianoze if there is a bug in git, or user error.

Hello!

Iván V. wrote:

Certainly you mean "git stash apply". "git apply" is something different.

git stash pop --index

I think that should get you exactly where you were before "git stash". The --index makes it also restore the index, which wouldn't happen by default. Using 'pop' instead of 'apply' makes it remove the stash after re-applying it.

jlh