Daniel wrote: > I did: > > $ git stash > $ git pop > > $ git checkout -- <modified files> > > Now I don't have changes I stashed. I guess the blobs with stashed > files should be somewhere? Is there any way I can get back my changes? > I tried to use git-reflog, but I'm not sure how can I find the files > I need. The problem is that the stash itself is a reflog, so there is no extra safety layer. Recent versions of the git-stash(1) manpage[*] document a command that helps find the stashes: if you do not explicitly name them, the they will be called "WIP on <subject>" and can thus be found with git fsck --unreachable | grep commit | cut -d\ -f3 | xargs git log --merges --no-walk --grep=WIP [*] you can find a bleeding edge version at http://www.kernel.org/pub/software/scm/git/docs/git-stash.html -- Thomas Rast trast@{inf,student}.ethz.ch
Attachment:
signature.asc
Description: This is a digitally signed message part.