undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git stash: document apply's --index switch

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2007-10-01 00:30:27 +02:00 committed by Junio C Hamano
parent e6dc8d60fb
commit 0bdcac5666
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-stash.txt
View File

@ -63,7 +63,7 @@ show [<stash>]::
it will accept any format known to `git-diff` (e.g., `git-stash show 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). -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 Restore the changes recorded in the stash on top of the current
working tree state. When no `<stash>` is given, applies the latest 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 This operation can fail with conflicts; you need to resolve them
by hand in the working tree. 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:: clear::
Remove all the stashed states. Note that those states will then Remove all the stashed states. Note that those states will then