Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof

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

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index a42d4c85bddd539d46aaaafea6bf6412cd7c3436..1c64a02fe576a6bdad2afcbc96391ce0c2d541c4 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -9,10 +9,11 @@ SYNOPSIS
 --------
 [verse]
 'git stash' list [<options>]
 --------
 [verse]
 'git stash' list [<options>]

-'git stash' ( show | drop ) [<stash>]
-'git stash' ( pop | apply ) [--index] [<stash>]
+'git stash' show [<stash>]
+'git stash' drop [-q|--quiet] [<stash>]
+'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]

 'git stash' branch <branchname> [<stash>]
 'git stash' branch <branchname> [<stash>]

-'git stash' [save [--keep-index] [<message>]]
+'git stash' [save [--keep-index] [-q|--quiet] [<message>]]

 'git stash' clear
 'git stash' create
 
 'git stash' clear
 'git stash' create
 


@@ -41,7 +42,7 @@ is also possible).
 OPTIONS
 -------
 
 OPTIONS
 -------
 

-save [--keep-index] [<message>]::
+save [--keep-index] [-q|--quiet] [<message>]::

 
        Save your local modifications to a new 'stash', and run `git reset
        --hard` to revert them.  This is the default action when no
 
        Save your local modifications to a new 'stash', and run `git reset
        --hard` to revert them.  This is the default action when no


@@ -75,7 +76,7 @@ show [<stash>]::
        it will accept any format known to 'git-diff' (e.g., `git stash show
        -p stash@\{1}` to view the second most recent stash in patch form).
 
        it will accept any format known to 'git-diff' (e.g., `git stash show
        -p stash@\{1}` to view the second most recent stash in patch form).
 

-pop [<stash>]::
+pop [--index] [-q|--quiet] [<stash>]::

 
        Remove a single stashed state from the stash list and apply it
        on top of the current working tree state, i.e., do the inverse
 
        Remove a single stashed state from the stash list and apply it
        on top of the current working tree state, i.e., do the inverse


@@ -93,7 +94,7 @@ longer apply the changes as they were originally).
 +
 When no `<stash>` is given, `stash@\{0}` is assumed.
 
 +
 When no `<stash>` is given, `stash@\{0}` is assumed.
 

-apply [--index] [<stash>]::
+apply [--index] [-q|--quiet] [<stash>]::

 
        Like `pop`, but do not remove the state from the stash list.
 
 
        Like `pop`, but do not remove the state from the stash list.
 


@@ -115,7 +116,7 @@ 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>]::
+drop [-q|--quiet] [<stash>]::

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