From: Jean-Luc Herren <jlh@gmx.ch>
Date: Wed, 14 May 2008 20:51:40 GMT
Subject: Re: Newbie question: Is it possible to undo a stash?
Message-ID: <482B50DC.3020400@gmx.ch>
In-Reply-To: <509f40850805141256gce6ac1brf5ced6436f81dae8@mail.gmail.com>

Hello!

Iván V. wrote:
> 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...

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

> 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...

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