diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-09 15:46:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-09 15:46:41 +0000 |
| commit | f068d544c07224647660139a56e02c94e6c2048c (patch) | |
| tree | 17e5ccdc111a55c829076ecf9e8aac69704ac3be /git-stash.txt | |
| parent | 804b5214b40890c882924d4e69cf5c8bf9c551e8 (diff) | |
| download | git-htmldocs-f068d544c07224647660139a56e02c94e6c2048c.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-214-gf4f78
Diffstat (limited to 'git-stash.txt')
| -rw-r--r-- | git-stash.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-stash.txt b/git-stash.txt index 1cc24cc47..a42d4c85b 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -9,8 +9,8 @@ SYNOPSIS -------- [verse] 'git stash' list [<options>] -'git stash' (show | drop | pop ) [<stash>] -'git stash' apply [--index] [<stash>] +'git stash' ( show | drop ) [<stash>] +'git stash' ( pop | apply ) [--index] [<stash>] 'git stash' branch <branchname> [<stash>] 'git stash' [save [--keep-index] [<message>]] 'git stash' clear @@ -86,16 +86,16 @@ Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards. + -When no `<stash>` is given, `stash@\{0}` is assumed. See also `apply`. - -apply [--index] [<stash>]:: - - Like `pop`, but do not remove the state from the stash list. -+ 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). ++ +When no `<stash>` is given, `stash@\{0}` is assumed. + +apply [--index] [<stash>]:: + + Like `pop`, but do not remove the state from the stash list. branch <branchname> [<stash>]:: |