| blob | 154ebbea4dd3d602eddfc19a19481b749dac2079 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-stash(1) Manual Page
574 </h1>
577 <p>git-stash -
578 Stash the changes in a dirty working directory away
579 </p>
580 </div>
581 </div>
596 </div></div>
597 </div>
600 <div class="paragraph"><p>Use <tt>git stash</tt> when you want to record the current state of the
601 working directory and the index, but want to go back to a clean
602 working directory. The command saves your local modifications away
608 A stash is by default listed as "WIP on <em>branchname</em> …", but
609 you can give a more descriptive message on the command line when
610 you create one.</p></div>
612 stashes are found in the reflog of this reference and can be named using
615 is also possible).</p></div>
616 </div>
621 save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]
622 </dt>
623 <dd>
624 <p>
627 the description along with the stashed state. For quickly making
630 subcommand from making an unwanted stash.
631 </p>
632 <div class="paragraph"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the
633 index are left intact.</p></div>
634 <div class="paragraph"><p>If the <tt>--include-untracked</tt> option is used, all untracked files are also
637 ignored files are stashed and cleaned in addition to the untracked files.</p></div>
638 <div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from the diff
639 between HEAD and the working tree to be stashed. The stash entry is
640 constructed such that its index state is the same as the index state
641 of your repository, and its worktree contains only the changes you
642 selected interactively. The selected changes are then rolled back
644 <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
645 <div class="paragraph"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use
647 </dd>
650 </dt>
651 <dd>
652 <p>
655 the one before, etc.), the name of the branch that was current when the
656 stash was made, and a short description of the commit the stash was
657 based on.
658 </p>
663 </div></div>
666 </dd>
669 </dt>
670 <dd>
671 <p>
672 Show the changes recorded in the stash as a diff between the
674 shows the latest one. By default, the command shows the diffstat, but
677 </p>
678 </dd>
681 </dt>
682 <dd>
683 <p>
684 Remove a single stashed state from the stash list and apply it
685 on top of the current working tree state, i.e., do the inverse
687 match the index.
688 </p>
690 removed from the stash list. You need to resolve the conflicts by hand
692 <div class="paragraph"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working
694 have conflicts (which are stored in the index, where you therefore can no
695 longer apply the changes as they were originally).</p></div>
696 <div class="paragraph"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed, otherwise <tt><stash></tt> must
698 </dd>
701 </dt>
702 <dd>
703 <p>
707 </p>
708 </dd>
711 </dt>
712 <dd>
713 <p>
718 <tt>stash@{<revision>}</tt>, it then drops the <tt><stash></tt>. When no <tt><stash></tt>
719 is given, applies the latest one.
720 </p>
721 <div class="paragraph"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has
723 the stash is applied on top of the commit that was HEAD at the time
725 no conflicts.</p></div>
726 </dd>
728 clear
729 </dt>
730 <dd>
731 <p>
732 Remove all the stashed states. Note that those states will then
733 be subject to pruning, and may be impossible to recover (see
735 </p>
736 </dd>
739 </dt>
740 <dd>
741 <p>
746 </p>
747 </dd>
749 create
750 </dt>
751 <dd>
752 <p>
753 Create a stash (which is a regular commit object) and return its
754 object name, without storing it anywhere in the ref namespace.
755 </p>
756 </dd>
757 </dl></div>
758 </div>
761 <div class="paragraph"><p>A stash is represented as a commit whose tree records the state of the
763 the stash was created. The tree of the second parent records the
764 state of the index when the stash is made, and it is made a child of
768 <pre><tt> .----W
769 / /
770 -----H----I</tt></pre>
771 </div></div>
772 <div class="paragraph"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state
774 tree.</p></div>
775 </div>
780 Pulling into a dirty tree
781 </dt>
782 <dd>
783 <p>
784 When you are in the middle of something, you learn that there are
785 upstream changes that are possibly relevant to what you are
786 doing. When your local changes do not conflict with the changes in
788 </p>
791 changes. In such a case, you can stash your changes away,
792 perform a pull, and then unstash, like this:</p></div>
795 <pre><tt>$ git pull
796 ...
797 file foobar not up to date, cannot merge.
798 $ git stash
799 $ git pull
800 $ git stash pop</tt></pre>
801 </div></div>
802 </dd>
804 Interrupted workflow
805 </dt>
806 <dd>
807 <p>
808 When you are in the middle of something, your boss comes in and
809 demands that you fix something immediately. Traditionally, you would
810 make a commit to a temporary branch to store your changes away, and
811 return to your original branch to make the emergency fix, like this:
812 </p>
815 <pre><tt># ... hack hack hack ...
816 $ git checkout -b my_wip
817 $ git commit -a -m "WIP"
818 $ git checkout master
819 $ edit emergency fix
820 $ git commit -a -m "Fix in a hurry"
821 $ git checkout my_wip
822 $ git reset --soft HEAD^
823 # ... continue hacking ...</tt></pre>
824 </div></div>
825 <div class="paragraph"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div>
828 <pre><tt># ... hack hack hack ...
829 $ git stash
830 $ edit emergency fix
831 $ git commit -a -m "Fix in a hurry"
832 $ git stash pop
833 # ... continue hacking ...</tt></pre>
834 </div></div>
835 </dd>
837 Testing partial commits
838 </dt>
839 <dd>
840 <p>
842 more commits out of the changes in the work tree, and you want to test
843 each change before committing:
844 </p>
847 <pre><tt># ... hack hack hack ...
848 $ git add --patch foo # add just first part to the index
849 $ git stash save --keep-index # save all other changes to the stash
850 $ edit/build/test first part
851 $ git commit -m 'First part' # commit fully tested change
852 $ git stash pop # prepare to work on all other changes
853 # ... repeat above five steps until one commit remains ...
854 $ edit/build/test remaining parts
855 $ git commit foo -m 'Remaining parts'</tt></pre>
856 </div></div>
857 </dd>
859 Recovering stashes that were cleared/dropped erroneously
860 </dt>
861 <dd>
862 <p>
863 If you mistakenly drop or clear stashes, they cannot be recovered
864 through the normal safety mechanisms. However, you can try the
865 following incantation to get a list of stashes that are still in your
866 repository, but not reachable any more:
867 </p>
870 <pre><tt>git fsck --unreachable |
871 grep commit | cut -d\ -f3 |
872 xargs git log --merges --no-walk --grep=WIP</tt></pre>
873 </div></div>
874 </dd>
875 </dl></div>
876 </div>
883 </div>
887 </div>
888 </div>
893 </div>
894 </div>
895 </body>
896 </html>