1git-stash(1) 2============ 3 4NAME 5---- 6git-stash - Stash the changes in a dirty working directory away 7 8SYNOPSIS 9-------- 10[verse] 11'git-stash' (list | show [<stash>] | apply [<stash>] | clear) 12'git-stash' [save [<message>]] 13 14DESCRIPTION 15----------- 16 17Use 'git-stash' when you want to record the current state of the 18working directory and the index, but want to go back to a clean 19working directory. The command saves your local modifications away 20and reverts the working directory to match the `HEAD` commit. 21 22The modifications stashed away by this command can be listed with 23`git-stash list`, inspected with `git-stash show`, and restored 24(potentially on top of a different commit) with `git-stash apply`. 25Calling git-stash without any arguments is equivalent to `git-stash 26save`. A stash is by default listed as "WIP on 'branchname' ...", but 27you can give a more descriptive message on the command line when 28you create one. 29 30The latest stash you created is stored in `$GIT_DIR/refs/stash`; older 31stashes are found in the reflog of this reference and can be named using 32the usual reflog syntax (e.g. `stash@\{0}` is the most recently 33created stash, `stash@\{1}` is the one before it, `stash@\{2.hours.ago}` 34is also possible). 35 36OPTIONS 37------- 38 39save [<message>]:: 40 41 Save your local modifications to a new 'stash', and run `git-reset 42 --hard` to revert them. This is the default action when no 43 subcommand is given. The <message> part is optional and gives 44 the description along with the stashed state. 45 46list:: 47 48 List the stashes that you currently have. Each 'stash' is listed 49 with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is 50 the one before, etc.), the name of the branch that was current when the 51 stash was made, and a short description of the commit the stash was 52 based on. 53+ 54---------------------------------------------------------------- 55stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation 56stash@{1}: On master: 9cc0589... Add git-stash 57---------------------------------------------------------------- 58 59show [<stash>]:: 60 61 Show the changes recorded in the stash as a diff between the 62 stashed state and its original parent. When no `<stash>` is given, 63 shows the latest one. By default, the command shows the diffstat, but 64 it will accept any format known to `git-diff` (e.g., `git-stash show 65 -p stash@\{1}` to view the second most recent stash in patch form). 66 67apply [--index] [<stash>]:: 68 69 Restore the changes recorded in the stash on top of the current 70 working tree state. When no `<stash>` is given, applies the latest 71 one. The working directory must match the index. 72+ 73This operation can fail with conflicts; you need to resolve them 74by hand in the working tree. 75+ 76If the `--index` option is used, then tries to reinstate not only the working 77tree's changes, but also the index's ones. However, this can fail, when you 78have conflicts (which are stored in the index, where you therefore can no 79longer apply the changes as they were originally). 80 81clear:: 82 Remove all the stashed states. Note that those states will then 83 be subject to pruning, and may be difficult or impossible to recover. 84 85 86DISCUSSION 87---------- 88 89A stash is represented as a commit whose tree records the state of the 90working directory, and its first parent is the commit at `HEAD` when 91the stash was created. The tree of the second parent records the 92state of the index when the stash is made, and it is made a child of 93the `HEAD` commit. The ancestry graph looks like this: 94 95 .----W 96 / / 97 -----H----I 98 99where `H` is the `HEAD` commit, `I` is a commit that records the state 100of the index, and `W` is a commit that records the state of the working 101tree. 102 103 104EXAMPLES 105-------- 106 107Pulling into a dirty tree:: 108 109When you are in the middle of something, you learn that there are 110upstream changes that are possibly relevant to what you are 111doing. When your local changes do not conflict with the changes in 112the upstream, a simple `git pull` will let you move forward. 113+ 114However, there are cases in which your local changes do conflict with 115the upstream changes, and `git pull` refuses to overwrite your 116changes. In such a case, you can stash your changes away, 117perform a pull, and then unstash, like this: 118+ 119---------------------------------------------------------------- 120$ git pull 121... 122file foobar not up to date, cannot merge. 123$ git stash 124$ git pull 125$ git stash apply 126---------------------------------------------------------------- 127 128Interrupted workflow:: 129 130When you are in the middle of something, your boss comes in and 131demands that you fix something immediately. Traditionally, you would 132make a commit to a temporary branch to store your changes away, and 133return to your original branch to make the emergency fix, like this: 134+ 135---------------------------------------------------------------- 136... hack hack hack ... 137$ git checkout -b my_wip 138$ git commit -a -m "WIP" 139$ git checkout master 140$ edit emergency fix 141$ git commit -a -m "Fix in a hurry" 142$ git checkout my_wip 143$ git reset --soft HEAD^ 144... continue hacking ... 145---------------------------------------------------------------- 146+ 147You can use `git-stash` to simplify the above, like this: 148+ 149---------------------------------------------------------------- 150... hack hack hack ... 151$ git stash 152$ edit emergency fix 153$ git commit -a -m "Fix in a hurry" 154$ git stash apply 155... continue hacking ... 156---------------------------------------------------------------- 157 158SEE ALSO 159-------- 160linkgit:git-checkout[1], 161linkgit:git-commit[1], 162linkgit:git-reflog[1], 163linkgit:git-reset[1] 164 165AUTHOR 166------ 167Written by Nanako Shiraishi <nanako3@bluebottle.com> 168 169GIT 170--- 171Part of the linkgit:git[7] suite