| blob | 240f088d3c678aa8a65ed2b3d6edf5b46c810680 |
4 <head>
8 /* Debug borders */
10 /*
11 border: 1px solid red;
12 */
13 }
15 body {
17 }
19 a {
22 }
25 }
27 em {
29 }
31 strong {
33 }
35 tt {
37 }
45 }
49 }
50 h2 {
52 }
53 h3 {
55 }
56 h3 + * {
58 }
63 }
65 hr {
67 }
69 p {
72 }
74 pre {
77 }
79 span#author {
84 }
85 span#email {
86 }
87 span#revision {
89 }
91 div#footer {
97 }
98 div#footer-text {
101 }
102 div#footer-badges {
105 }
107 div#preamble,
114 }
118 }
122 }
124 /* Block element titles. */
131 }
134 }
138 }
141 }
144 }
150 }
154 }
159 }
163 }
167 }
170 }
179 }
183 }
188 }
192 }
198 dl {
201 }
202 dt {
206 }
209 }
213 }
216 }
220 }
221 thead {
224 }
225 tfoot {
227 }
232 }
235 }
240 }
243 }
247 }
249 div#toctitle {
256 }
261 }
265 }
269 }
273 }
275 /* Workarounds for IE6's broken and incomplete CSS2. */
281 }
287 }
293 }
297 }
302 }
304 /* IE6 sets dynamically generated links as visited. */
306 </style>
308 </head>
309 <body>
311 <h1>
312 git-stash(1) Manual Page
313 </h1>
316 <p>git-stash -
317 Stash the changes in a dirty working directory away
318 </p>
319 </div>
320 </div>
332 </div>
336 working directory and the index, but want to go back to a clean
337 working directory. The command saves your local modifications away
343 A stash is by default listed as "WIP on <em>branchname</em> …", but
344 you can give a more descriptive message on the command line when
345 you create one.</p></div>
346 <div class="para"><p>The latest stash you created is stored in <tt>$GIT_DIR/refs/stash</tt>; older
347 stashes are found in the reflog of this reference and can be named using
350 is also possible).</p></div>
351 </div>
355 <dt>
357 </dt>
358 <dd>
359 <p>
361 --hard</tt> to revert them. This is the default action when no
363 the description along with the stashed state.
364 </p>
365 <div class="para"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the
366 index are left intact.</p></div>
367 </dd>
368 <dt>
370 </dt>
371 <dd>
372 <p>
375 the one before, etc.), the name of the branch that was current when the
376 stash was made, and a short description of the commit the stash was
377 based on.
378 </p>
383 </div></div>
386 </dd>
387 <dt>
389 </dt>
390 <dd>
391 <p>
392 Show the changes recorded in the stash as a diff between the
394 shows the latest one. By default, the command shows the diffstat, but
397 </p>
398 </dd>
399 <dt>
401 </dt>
402 <dd>
403 <p>
404 Remove a single stashed state from the stash list and apply it
405 on top of the current working tree state, i.e., do the inverse
407 match the index.
408 </p>
410 removed from the stash list. You need to resolve the conflicts by hand
412 <div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working
413 tree's changes, but also the index's ones. However, this can fail, when you
414 have conflicts (which are stored in the index, where you therefore can no
415 longer apply the changes as they were originally).</p></div>
416 <div class="para"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed.</p></div>
417 </dd>
418 <dt>
420 </dt>
421 <dd>
422 <p>
424 </p>
425 </dd>
426 <dt>
428 </dt>
429 <dd>
430 <p>
435 is given, applies the latest one.
436 </p>
439 the stash is applied on top of the commit that was HEAD at the time
441 no conflicts.</p></div>
442 </dd>
443 <dt>
444 clear
445 </dt>
446 <dd>
447 <p>
448 Remove all the stashed states. Note that those states will then
449 be subject to pruning, and may be difficult or impossible to recover.
450 </p>
451 </dd>
452 <dt>
454 </dt>
455 <dd>
456 <p>
459 </p>
460 </dd>
461 <dt>
462 create
463 </dt>
464 <dd>
465 <p>
466 Create a stash (which is a regular commit object) and return its
467 object name, without storing it anywhere in the ref namespace.
468 </p>
469 </dd>
470 </dl></div>
471 </div>
476 the stash was created. The tree of the second parent records the
477 state of the index when the stash is made, and it is made a child of
481 <pre><tt> .----W
482 / /
483 -----H----I</tt></pre>
484 </div></div>
485 <div class="para"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state
487 tree.</p></div>
488 </div>
492 <dt>
493 Pulling into a dirty tree
494 </dt>
495 <dd>
496 <p>
497 When you are in the middle of something, you learn that there are
498 upstream changes that are possibly relevant to what you are
499 doing. When your local changes do not conflict with the changes in
501 </p>
504 changes. In such a case, you can stash your changes away,
505 perform a pull, and then unstash, like this:</p></div>
508 <pre><tt>$ git pull
509 ...
510 file foobar not up to date, cannot merge.
511 $ git stash
512 $ git pull
513 $ git stash pop</tt></pre>
514 </div></div>
515 </dd>
516 <dt>
517 Interrupted workflow
518 </dt>
519 <dd>
520 <p>
521 When you are in the middle of something, your boss comes in and
522 demands that you fix something immediately. Traditionally, you would
523 make a commit to a temporary branch to store your changes away, and
524 return to your original branch to make the emergency fix, like this:
525 </p>
528 <pre><tt># ... hack hack hack ...
529 $ git checkout -b my_wip
530 $ git commit -a -m "WIP"
531 $ git checkout master
532 $ edit emergency fix
533 $ git commit -a -m "Fix in a hurry"
534 $ git checkout my_wip
535 $ git reset --soft HEAD^
536 # ... continue hacking ...</tt></pre>
537 </div></div>
541 <pre><tt># ... hack hack hack ...
542 $ git stash
543 $ edit emergency fix
544 $ git commit -a -m "Fix in a hurry"
545 $ git stash pop
546 # ... continue hacking ...</tt></pre>
547 </div></div>
548 </dd>
549 <dt>
550 Testing partial commits
551 </dt>
552 <dd>
553 <p>
555 more commits out of the changes in the work tree, and you want to test
556 each change before committing:
557 </p>
560 <pre><tt># ... hack hack hack ...
561 $ git add --patch foo # add just first part to the index
562 $ git stash save --keep-index # save all other changes to the stash
563 $ edit/build/test first part
564 $ git commit -m 'First part' # commit fully tested change
565 $ git stash pop # prepare to work on all other changes
566 # ... repeat above five steps until one commit remains ...
567 $ edit/build/test remaining parts
568 $ git commit foo -m 'Remaining parts'</tt></pre>
569 </div></div>
570 </dd>
571 </dl></div>
572 </div>
579 </div>
583 </div>
587 </div>
591 </div>
592 </div>
593 </body>
594 </html>