diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-08-11 06:23:52 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-08-11 06:23:52 +0000 |
commit | 9f88386765adc1aacb4a0e3b488c69cffc59ca70 (patch) | |
tree | 2875537bd869b9969298d294b8131e3ec70dd856 /git-stash.txt | |
parent | 31cca1669fe45cbdca5a7f6b888e9a1d04ee1f10 (diff) | |
download | git-htmldocs-9f88386765adc1aacb4a0e3b488c69cffc59ca70.tar.gz |
Autogenerated HTML docs for v1.6.4-114-gefd1
Diffstat (limited to 'git-stash.txt')
-rw-r--r-- | git-stash.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/git-stash.txt b/git-stash.txt index 1c64a02fe..2f5ca7b1a 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -114,7 +114,8 @@ no conflicts. clear:: Remove all the stashed states. Note that those states will then - be subject to pruning, and may be difficult or impossible to recover. + be subject to pruning, and may be impossible to recover (see + 'Examples' below for a possible strategy). drop [-q|--quiet] [<stash>]:: @@ -217,6 +218,20 @@ $ edit/build/test remaining parts $ git commit foo -m 'Remaining parts' ---------------------------------------------------------------- +Recovering stashes that were cleared/dropped erroneously:: + +If you mistakenly drop or clear stashes, they cannot be recovered +through the normal safety mechanisms. However, you can try the +following incantation to get a list of stashes that are still in your +repository, but not reachable any more: ++ +---------------------------------------------------------------- +git fsck --unreachable | +grep commit | cut -d\ -f3 | +xargs git log --merges --no-walk --grep=WIP +---------------------------------------------------------------- + + SEE ALSO -------- linkgit:git-checkout[1], |