diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-05-31 21:53:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-05-31 21:53:30 +0000 |
| commit | 7d3275ed7fbf0a517277af446e8c3c6226fa7702 (patch) | |
| tree | 50a098c9da71ed14aacafce49c427eac59c940bf /git-stash.txt | |
| parent | 9f10ed359a3a4153921ef654002b468cc7f8c78f (diff) | |
| download | git-htmldocs-7d3275ed7fbf0a517277af446e8c3c6226fa7702.tar.gz | |
Autogenerated HTML docs for v1.6.3.1-187-g0ddb
Diffstat (limited to 'git-stash.txt')
| -rw-r--r-- | git-stash.txt | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/git-stash.txt b/git-stash.txt index 051f94d26..1cc24cc47 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -75,14 +75,22 @@ show [<stash>]:: 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 [--index] [<stash>]:: +pop [<stash>]:: - Restore the changes recorded in the stash on top of the current - working tree state. When no `<stash>` is given, applies the latest - one. The working directory must match the index. + Remove a single stashed state from the stash list and apply it + on top of the current working tree state, i.e., do the inverse + operation of `git stash save`. The working directory must + match the index. + -This operation can fail with conflicts; you need to resolve them -by hand in the working tree. +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 @@ -112,12 +120,6 @@ drop [<stash>]:: Remove a single stashed state from the stash list. When no `<stash>` is given, it removes the latest one. i.e. `stash@\{0}` -pop [<stash>]:: - - Remove a single stashed state from the stash list and apply on top - of the current working tree state. When no `<stash>` is given, - `stash@\{0}` is assumed. See also `apply`. - create:: Create a stash (which is a regular commit object) and return its @@ -163,7 +165,7 @@ $ git pull file foobar not up to date, cannot merge. $ git stash $ git pull -$ git stash apply +$ git stash pop ---------------------------------------------------------------- Interrupted workflow:: @@ -192,7 +194,7 @@ You can use 'git-stash' to simplify the above, like this: $ git stash $ edit emergency fix $ git commit -a -m "Fix in a hurry" -$ git stash apply +$ git stash pop # ... continue hacking ... ---------------------------------------------------------------- |