X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-stash.txt;h=baa4f55b48ac2fad72b18651a98bc542d1f38f5c;hb=a41a32bf1ce74f3be5c1ab398db1a93b89e6a99e;hp=48e6f5a3f7a85e886639381dfa70434ecdeccfc2;hpb=cb99be7c7d2afc71106ffaf400c769c8e72f1bb2;p=git.git diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 48e6f5a3f..baa4f55b4 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -8,7 +8,7 @@ git-stash - Stash the changes in a dirty working directory away SYNOPSIS -------- [verse] -'git-stash' (list | show [] | apply [] | clear) +'git-stash' (list | show [] | apply [] | clear | drop [] | pop []) 'git-stash' [save []] DESCRIPTION @@ -85,6 +85,17 @@ clear:: Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. +drop []:: + + Remove a single stashed state from the stash list. When no `` + is given, it removes the latest one. i.e. `stash@\{0}` + +pop []:: + + Remove a single stashed state from the stash list and apply on top + of the current working tree state. When no `` is given, + `stash@\{0}` is assumed. See also `apply`. + DISCUSSION ---------- @@ -171,4 +182,4 @@ Written by Nanako Shiraishi GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite