]>
Commit | Line | Data |
---|---|---|
09ccdb63 NS |
1 | git-stash(1) |
2 | ============ | |
3 | ||
4 | NAME | |
5 | ---- | |
6 | git-stash - Stash the changes in a dirty working directory away | |
7 | ||
8 | SYNOPSIS | |
9 | -------- | |
10 | [verse] | |
a5ab00c5 | 11 | 'git stash' list [<options>] |
fcdd0e92 SB |
12 | 'git stash' show [<stash>] |
13 | 'git stash' drop [-q|--quiet] [<stash>] | |
14 | 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] | |
656b5034 | 15 | 'git stash' branch <branchname> [<stash>] |
aa7e722d | 16 | 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] |
c1ebd90c | 17 | [-u|--include-untracked] [-a|--all] [<message>]] |
656b5034 | 18 | 'git stash' clear |
2be43516 | 19 | 'git stash' create [<message>] |
bd514cad | 20 | 'git stash' store [-m|--message <message>] [-q|--quiet] <commit> |
09ccdb63 NS |
21 | |
22 | DESCRIPTION | |
23 | ----------- | |
24 | ||
ca768288 | 25 | Use `git stash` when you want to record the current state of the |
09ccdb63 NS |
26 | working directory and the index, but want to go back to a clean |
27 | working directory. The command saves your local modifications away | |
28 | and reverts the working directory to match the `HEAD` commit. | |
29 | ||
30 | The modifications stashed away by this command can be listed with | |
483bc4f0 JN |
31 | `git stash list`, inspected with `git stash show`, and restored |
32 | (potentially on top of a different commit) with `git stash apply`. | |
33 | Calling `git stash` without any arguments is equivalent to `git stash save`. | |
34 | A stash is by default listed as "WIP on 'branchname' ...", but | |
ec96e0f6 NS |
35 | you can give a more descriptive message on the command line when |
36 | you create one. | |
09ccdb63 | 37 | |
cc1b8d8b | 38 | The latest stash you created is stored in `refs/stash`; older |
9488e875 | 39 | stashes are found in the reflog of this reference and can be named using |
6cf378f0 JK |
40 | the usual reflog syntax (e.g. `stash@{0}` is the most recently |
41 | created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` | |
9488e875 | 42 | is also possible). |
09ccdb63 NS |
43 | |
44 | OPTIONS | |
45 | ------- | |
46 | ||
c20aec05 | 47 | save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]:: |
09ccdb63 | 48 | |
b1889c36 | 49 | Save your local modifications to a new 'stash', and run `git reset |
3c2eb80f MM |
50 | --hard` to revert them. The <message> part is optional and gives |
51 | the description along with the stashed state. For quickly making | |
52 | a snapshot, you can omit _both_ "save" and <message>, but giving | |
53 | only <message> does not trigger this action to prevent a misspelled | |
54 | subcommand from making an unwanted stash. | |
7bedebca SG |
55 | + |
56 | If the `--keep-index` option is used, all changes already added to the | |
57 | index are left intact. | |
dda1f2a5 | 58 | + |
78751302 DC |
59 | If the `--include-untracked` option is used, all untracked files are also |
60 | stashed and then cleaned up with `git clean`, leaving the working directory | |
61 | in a very clean state. If the `--all` option is used instead then the | |
62 | ignored files are stashed and cleaned in addition to the untracked files. | |
63 | + | |
f2808a50 | 64 | With `--patch`, you can interactively select hunks from the diff |
dda1f2a5 TR |
65 | between HEAD and the working tree to be stashed. The stash entry is |
66 | constructed such that its index state is the same as the index state | |
67 | of your repository, and its worktree contains only the changes you | |
68 | selected interactively. The selected changes are then rolled back | |
f2808a50 | 69 | from your worktree. See the ``Interactive Mode'' section of |
6cf378f0 | 70 | linkgit:git-add[1] to learn how to operate the `--patch` mode. |
dda1f2a5 TR |
71 | + |
72 | The `--patch` option implies `--keep-index`. You can use | |
73 | `--no-keep-index` to override this. | |
09ccdb63 | 74 | |
fbd538c2 | 75 | list [<options>]:: |
09ccdb63 NS |
76 | |
77 | List the stashes that you currently have. Each 'stash' is listed | |
6cf378f0 | 78 | with its name (e.g. `stash@{0}` is the latest stash, `stash@{1}` is |
9488e875 | 79 | the one before, etc.), the name of the branch that was current when the |
09ccdb63 NS |
80 | stash was made, and a short description of the commit the stash was |
81 | based on. | |
82 | + | |
83 | ---------------------------------------------------------------- | |
ec96e0f6 NS |
84 | stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation |
85 | stash@{1}: On master: 9cc0589... Add git-stash | |
09ccdb63 | 86 | ---------------------------------------------------------------- |
fbd538c2 | 87 | + |
0b444cdb | 88 | The command takes options applicable to the 'git log' |
b7b10385 | 89 | command to control what is shown and how. See linkgit:git-log[1]. |
09ccdb63 NS |
90 | |
91 | show [<stash>]:: | |
92 | ||
06ada152 | 93 | Show the changes recorded in the stash as a diff between the |
9488e875 JH |
94 | stashed state and its original parent. When no `<stash>` is given, |
95 | shows the latest one. By default, the command shows the diffstat, but | |
0b444cdb | 96 | it will accept any format known to 'git diff' (e.g., `git stash show |
6cf378f0 | 97 | -p stash@{1}` to view the second most recent stash in patch form). |
09ccdb63 | 98 | |
fcdd0e92 | 99 | pop [--index] [-q|--quiet] [<stash>]:: |
09ccdb63 | 100 | |
d1836637 TR |
101 | Remove a single stashed state from the stash list and apply it |
102 | on top of the current working tree state, i.e., do the inverse | |
103 | operation of `git stash save`. The working directory must | |
104 | match the index. | |
9488e875 | 105 | + |
d1836637 TR |
106 | Applying the state can fail with conflicts; in this case, it is not |
107 | removed from the stash list. You need to resolve the conflicts by hand | |
108 | and call `git stash drop` manually afterwards. | |
109 | + | |
0bdcac56 MV |
110 | If the `--index` option is used, then tries to reinstate not only the working |
111 | tree's changes, but also the index's ones. However, this can fail, when you | |
112 | have conflicts (which are stored in the index, where you therefore can no | |
113 | longer apply the changes as they were originally). | |
f39d6ee2 | 114 | + |
6cf378f0 JK |
115 | When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must |
116 | be a reference of the form `stash@{<revision>}`. | |
f39d6ee2 | 117 | |
fcdd0e92 | 118 | apply [--index] [-q|--quiet] [<stash>]:: |
f39d6ee2 | 119 | |
b0c6bf4a JS |
120 | Like `pop`, but do not remove the state from the stash list. Unlike `pop`, |
121 | `<stash>` may be any commit that looks like a commit created by | |
122 | `stash save` or `stash create`. | |
09ccdb63 | 123 | |
656b5034 AMS |
124 | branch <branchname> [<stash>]:: |
125 | ||
126 | Creates and checks out a new branch named `<branchname>` starting from | |
127 | the commit at which the `<stash>` was originally created, applies the | |
b0c6bf4a JS |
128 | changes recorded in `<stash>` to the new working tree and index. |
129 | If that succeeds, and `<stash>` is a reference of the form | |
130 | `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` | |
656b5034 AMS |
131 | is given, applies the latest one. |
132 | + | |
133 | This is useful if the branch on which you ran `git stash save` has | |
134 | changed enough that `git stash apply` fails due to conflicts. Since | |
135 | the stash is applied on top of the commit that was HEAD at the time | |
136 | `git stash` was run, it restores the originally stashed state with | |
137 | no conflicts. | |
138 | ||
09ccdb63 | 139 | clear:: |
9488e875 | 140 | Remove all the stashed states. Note that those states will then |
f5f1e164 TR |
141 | be subject to pruning, and may be impossible to recover (see |
142 | 'Examples' below for a possible strategy). | |
09ccdb63 | 143 | |
fcdd0e92 | 144 | drop [-q|--quiet] [<stash>]:: |
e25d5f9c BC |
145 | |
146 | Remove a single stashed state from the stash list. When no `<stash>` | |
6cf378f0 | 147 | is given, it removes the latest one. i.e. `stash@{0}`, otherwise |
5badfdcf | 148 | `<stash>` must be a valid stash log reference of the form |
6cf378f0 | 149 | `stash@{<revision>}`. |
e25d5f9c | 150 | |
a5ab00c5 SB |
151 | create:: |
152 | ||
153 | Create a stash (which is a regular commit object) and return its | |
154 | object name, without storing it anywhere in the ref namespace. | |
2be43516 RR |
155 | This is intended to be useful for scripts. It is probably not |
156 | the command you want to use; see "save" above. | |
a5ab00c5 | 157 | |
bd514cad RR |
158 | store:: |
159 | ||
160 | Store a given stash created via 'git stash create' (which is a | |
161 | dangling merge commit) in the stash ref, updating the stash | |
162 | reflog. This is intended to be useful for scripts. It is | |
163 | probably not the command you want to use; see "save" above. | |
09ccdb63 NS |
164 | |
165 | DISCUSSION | |
166 | ---------- | |
167 | ||
168 | A stash is represented as a commit whose tree records the state of the | |
169 | working directory, and its first parent is the commit at `HEAD` when | |
170 | the stash was created. The tree of the second parent records the | |
171 | state of the index when the stash is made, and it is made a child of | |
172 | the `HEAD` commit. The ancestry graph looks like this: | |
173 | ||
174 | .----W | |
175 | / / | |
114fd812 | 176 | -----H----I |
09ccdb63 NS |
177 | |
178 | where `H` is the `HEAD` commit, `I` is a commit that records the state | |
179 | of the index, and `W` is a commit that records the state of the working | |
180 | tree. | |
181 | ||
182 | ||
183 | EXAMPLES | |
184 | -------- | |
185 | ||
186 | Pulling into a dirty tree:: | |
187 | ||
188 | When you are in the middle of something, you learn that there are | |
9488e875 JH |
189 | upstream changes that are possibly relevant to what you are |
190 | doing. When your local changes do not conflict with the changes in | |
09ccdb63 NS |
191 | the upstream, a simple `git pull` will let you move forward. |
192 | + | |
193 | However, there are cases in which your local changes do conflict with | |
194 | the upstream changes, and `git pull` refuses to overwrite your | |
9488e875 | 195 | changes. In such a case, you can stash your changes away, |
09ccdb63 NS |
196 | perform a pull, and then unstash, like this: |
197 | + | |
198 | ---------------------------------------------------------------- | |
199 | $ git pull | |
9da6f0ff | 200 | ... |
09ccdb63 NS |
201 | file foobar not up to date, cannot merge. |
202 | $ git stash | |
203 | $ git pull | |
d1836637 | 204 | $ git stash pop |
09ccdb63 NS |
205 | ---------------------------------------------------------------- |
206 | ||
207 | Interrupted workflow:: | |
208 | ||
209 | When you are in the middle of something, your boss comes in and | |
9488e875 | 210 | demands that you fix something immediately. Traditionally, you would |
09ccdb63 | 211 | make a commit to a temporary branch to store your changes away, and |
9488e875 | 212 | return to your original branch to make the emergency fix, like this: |
09ccdb63 NS |
213 | + |
214 | ---------------------------------------------------------------- | |
9da6f0ff | 215 | # ... hack hack hack ... |
09ccdb63 NS |
216 | $ git checkout -b my_wip |
217 | $ git commit -a -m "WIP" | |
218 | $ git checkout master | |
219 | $ edit emergency fix | |
220 | $ git commit -a -m "Fix in a hurry" | |
221 | $ git checkout my_wip | |
222 | $ git reset --soft HEAD^ | |
9da6f0ff | 223 | # ... continue hacking ... |
09ccdb63 NS |
224 | ---------------------------------------------------------------- |
225 | + | |
0b444cdb | 226 | You can use 'git stash' to simplify the above, like this: |
09ccdb63 NS |
227 | + |
228 | ---------------------------------------------------------------- | |
9da6f0ff | 229 | # ... hack hack hack ... |
09ccdb63 NS |
230 | $ git stash |
231 | $ edit emergency fix | |
232 | $ git commit -a -m "Fix in a hurry" | |
d1836637 | 233 | $ git stash pop |
9da6f0ff | 234 | # ... continue hacking ... |
09ccdb63 NS |
235 | ---------------------------------------------------------------- |
236 | ||
7bedebca SG |
237 | Testing partial commits:: |
238 | ||
239 | You can use `git stash save --keep-index` when you want to make two or | |
240 | more commits out of the changes in the work tree, and you want to test | |
241 | each change before committing: | |
242 | + | |
243 | ---------------------------------------------------------------- | |
9da6f0ff | 244 | # ... hack hack hack ... |
caf18996 ER |
245 | $ git add --patch foo # add just first part to the index |
246 | $ git stash save --keep-index # save all other changes to the stash | |
247 | $ edit/build/test first part | |
f733c709 | 248 | $ git commit -m 'First part' # commit fully tested change |
caf18996 | 249 | $ git stash pop # prepare to work on all other changes |
9da6f0ff | 250 | # ... repeat above five steps until one commit remains ... |
caf18996 ER |
251 | $ edit/build/test remaining parts |
252 | $ git commit foo -m 'Remaining parts' | |
7bedebca SG |
253 | ---------------------------------------------------------------- |
254 | ||
f5f1e164 TR |
255 | Recovering stashes that were cleared/dropped erroneously:: |
256 | ||
257 | If you mistakenly drop or clear stashes, they cannot be recovered | |
258 | through the normal safety mechanisms. However, you can try the | |
259 | following incantation to get a list of stashes that are still in your | |
260 | repository, but not reachable any more: | |
261 | + | |
262 | ---------------------------------------------------------------- | |
263 | git fsck --unreachable | | |
264 | grep commit | cut -d\ -f3 | | |
265 | xargs git log --merges --no-walk --grep=WIP | |
266 | ---------------------------------------------------------------- | |
267 | ||
268 | ||
09ccdb63 NS |
269 | SEE ALSO |
270 | -------- | |
5162e697 DM |
271 | linkgit:git-checkout[1], |
272 | linkgit:git-commit[1], | |
273 | linkgit:git-reflog[1], | |
274 | linkgit:git-reset[1] | |
09ccdb63 | 275 | |
09ccdb63 NS |
276 | GIT |
277 | --- | |
9e1f0a85 | 278 | Part of the linkgit:git[1] suite |