@matheusbsbs / matheus-bagliano / commits / 0bdcac5666
Fork 0

git stash: document apply's --index switch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Miklos Vajna committed Oct 1, 2007 at 00:30 UTC 0bdcac5666170547dc7882cc1d39b0481206074b
1 file changed +6 -1
Documentation/git-stash.txt
+6 -1
@@ -63,7 +63,7 @@ show [<stash>]::
63 it will accept any format known to `git-diff` (e.g., `git-stash show
64 -p stash@\{1}` to view the second most recent stash in patch form).
65
66 -apply [<stash>]::
66 +apply [--index] [<stash>]::
67
68 Restore the changes recorded in the stash on top of the current
69 working tree state. When no `<stash>` is given, applies the latest
@@ -71,6 +71,11 @@ apply [<stash>]::
71 +
72 This operation can fail with conflicts; you need to resolve them
73 by hand in the working tree.
74 ++
75 +If the `--index` option is used, then tries to reinstate not only the working
76 +tree's changes, but also the index's ones. However, this can fail, when you
77 +have conflicts (which are stored in the index, where you therefore can no
78 +longer apply the changes as they were originally).
79
80 clear::
81 Remove all the stashed states. Note that those states will then