summaryrefslogtreecommitdiff
path: root/Documentation/git-stash.txt
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2007-09-30 22:30:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-01 08:59:29 (GMT)
commit0bdcac5666170547dc7882cc1d39b0481206074b (patch)
tree63977613be5ca9b01ff0a185521459a44bb1ff74 /Documentation/git-stash.txt
parente6dc8d60fbd2c84900a26545c5d360b0e202d95b (diff)
downloadgit-0bdcac5666170547dc7882cc1d39b0481206074b.zip
git-0bdcac5666170547dc7882cc1d39b0481206074b.tar.gz
git-0bdcac5666170547dc7882cc1d39b0481206074b.tar.bz2
git stash: document apply's --index switch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-stash.txt')
-rw-r--r--Documentation/git-stash.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 05f40cf..5723bb0 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -63,7 +63,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).
-apply [<stash>]::
+apply [--index] [<stash>]::
Restore the changes recorded in the stash on top of the current
working tree state. When no `<stash>` is given, applies the latest
@@ -71,6 +71,11 @@ apply [<stash>]::
+
This operation can fail with conflicts; you need to resolve them
by hand in the working tree.
++
+If the `--index` option is used, then tries to reinstate not only the working
+tree's changes, but also the index's ones. However, this can fail, when you
+have conflicts (which are stored in the index, where you therefore can no
+longer apply the changes as they were originally).
clear::
Remove all the stashed states. Note that those states will then