From: Miklos Vajna Date: Sun, 30 Sep 2007 22:30:27 GMT Subject: [PATCH] git stash: document apply's --index switch Message-ID: <1191190557-24902-1-git-send-email-vmiklos@frugalware.org> In-Reply-To: --- On Sun, Sep 30, 2007 at 10:29:05PM +0100, Johannes Schindelin wrote: > Now that you know what --index is supposed to do, maybe you are nice > enough to extend the documentation and post a patch? something like this? VMiklos Documentation/git-stash.txt | 7 ++++++- 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 []:: 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 []:: +apply [--index] []:: Restore the changes recorded in the stash on top of the current working tree state. When no `` is given, applies the latest @@ -71,6 +71,11 @@ apply []:: + 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 -- 1.5.3.2.111.g5166-dirty