提交 0bdcac56 编写于 作者: M Miklos Vajna 提交者: Junio C Hamano

git stash: document apply's --index switch

Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 e6dc8d60
...@@ -63,7 +63,7 @@ show [<stash>]:: ...@@ -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>]:: ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册