git-stash: add new 'drop' subcommand

[git.git] / Documentation / git-stash.txt

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index cd0dc1bd9d53282d65c52e6b9ded6d40fe087598..f50c24ce9aa1c1d2937f3eb8ee27b349a6f0a3ba 100644 (file)
--- 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]
 SYNOPSIS
 --------
 [verse]

-'git-stash' (list | show [<stash>] | apply [<stash>] | clear)
+'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>])

 'git-stash' [save [<message>]]
 
 DESCRIPTION
 'git-stash' [save [<message>]]
 
 DESCRIPTION


@@ -43,7 +43,7 @@ save [<message>]::
        subcommand is given. The <message> part is optional and gives
        the description along with the stashed state.
 
        subcommand is given. The <message> part is optional and gives
        the description along with the stashed state.
 

-list::
+list [<options>]::

 
        List the stashes that you currently have.  Each 'stash' is listed
        with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is
 
        List the stashes that you currently have.  Each 'stash' is listed
        with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is


@@ -55,6 +55,9 @@ list::
 stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
 stash@{1}: On master: 9cc0589... Add git-stash
 ----------------------------------------------------------------
 stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
 stash@{1}: On master: 9cc0589... Add git-stash
 ----------------------------------------------------------------

++
+The command takes options applicable to the linkgit:git-log[1]
+command to control what is shown and how.

 
 show [<stash>]::
 
 
 show [<stash>]::
 


@@ -82,6 +85,11 @@ clear::
        Remove all the stashed states. Note that those states will then
        be subject to pruning, and may be difficult or impossible to recover.
 
        Remove all the stashed states. Note that those states will then
        be subject to pruning, and may be difficult or impossible to recover.
 

+drop [<stash>]::
+
+       Remove a single stashed state from the stash list. When no `<stash>`
+       is given, it removes the latest one. i.e. `stash@\{0}`
+

 
 DISCUSSION
 ----------
 
 DISCUSSION
 ----------