[PATCH v3 9/9] Documentation: git stash branch now tolerates non-stash references.
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- Aug 8, 2010, 04:46 UTC
- Message-ID
- <1281242771-24764-10-git-send-email-jon.seymour@gmail.com>
- In-Reply-To
- <1281242771-24764-1-git-send-email-jon.seymour@gmail.com>
Update the documentation to indicate that git stash branch only attempts to drop the specified stash if it looks like stash reference.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com> --- Documentation/git-stash.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 473889a..c7b7e4e 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -115,8 +115,8 @@ branch <branchname> [<stash>]:: Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index, then - drops the `<stash>` if that completes successfully. When no `<stash>` - is given, applies the latest one. + drops the `<stash>` if that completes successfully and `<stash>` looks like a + stash the name of a stash list entry. When no `<stash>` is given, applies the latest one. + This is useful if the branch on which you ran `git stash save` has changed enough that `git stash apply` fails due to conflicts. Since
-- 1.7.2.1.51.g82c0c0