Google Git
Sign in
chromium / external / gitster / git-htmldocs / fad84129b4a5c4269d078ca268c893969973c5d6 / . / git-stash.html
blob: c30b612b70da75f7f603d26590d56e9881f610cd [file] [log] [blame]
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]6<meta name="generator" content="AsciiDoc 8.6.9" />
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]7<title>git-stash(1)</title>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]8<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]40 color: navy;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]45 color: #083194;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]46}
47
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]55h1, h2, h3 {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]59 padding-top: 0.5em;
60}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]67h5 {
68 font-size: 1.0em;
69}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]70
71div.sectionbody {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]84ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]87ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]89
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]94 padding: 0;
95 margin: 0;
96}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]97pre {
98 white-space: pre-wrap;
99}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]100
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]101#author {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]102 color: #527bbd;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]103 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]104 font-size: 1.1em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#email {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]107}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]108#revnumber, #revdate, #revremark {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]109}
110
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]111#footer {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]112 font-size: small;
113 border-top: 2px solid silver;
114 padding-top: 0.5em;
115 margin-top: 4.0em;
116}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]117#footer-text {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]118 float: left;
119 padding-bottom: 0.5em;
120}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]121#footer-badges {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]122 float: right;
123 padding-bottom: 0.5em;
124}
125
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]126#preamble {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]127 margin-top: 1.5em;
128 margin-bottom: 1.5em;
129}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]130div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]131div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
132div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]133 margin-top: 1.0em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]134 margin-bottom: 1.5em;
135}
136div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]137 margin-top: 2.0em;
138 margin-bottom: 2.0em;
139 margin-right: 10%;
140 color: #606060;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]141}
142
143div.content { /* Block element content. */
144 padding: 0;
145}
146
147/* Block element titles. */
148div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]149 color: #527bbd;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]150 font-weight: bold;
151 text-align: left;
152 margin-top: 1.0em;
153 margin-bottom: 0.5em;
154}
155div.title + * {
156 margin-top: 0;
157}
158
159td div.title:first-child {
160 margin-top: 0.0em;
161}
162div.content div.title:first-child {
163 margin-top: 0.0em;
164}
165div.content + div.title {
166 margin-top: 0.0em;
167}
168
169div.sidebarblock > div.content {
170 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]171 border: 1px solid #dddddd;
172 border-left: 4px solid #f0f0f0;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]173 padding: 0.5em;
174}
175
176div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]177 border: 1px solid #dddddd;
178 border-left: 5px solid #f0f0f0;
179 background: #f8f8f8;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]180 padding: 0.5em;
181}
182
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]183div.quoteblock, div.verseblock {
184 padding-left: 1.0em;
185 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]186 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]187 border-left: 5px solid #f0f0f0;
188 color: #888;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]189}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]190
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]191div.quoteblock > div.attribution {
192 padding-top: 0.5em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]193 text-align: right;
194}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]195
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]196div.verseblock > pre.content {
197 font-family: inherit;
198 font-size: inherit;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]199}
200div.verseblock > div.attribution {
201 padding-top: 0.75em;
202 text-align: left;
203}
204/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]205div.verseblock + div.attribution {
206 text-align: left;
207}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]208
209div.admonitionblock .icon {
210 vertical-align: top;
211 font-size: 1.1em;
212 font-weight: bold;
213 text-decoration: underline;
214 color: #527bbd;
215 padding-right: 0.5em;
216}
217div.admonitionblock td.content {
218 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]219 border-left: 3px solid #dddddd;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]220}
221
222div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]223 border-left: 3px solid #dddddd;
224 padding-left: 0.5em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]225}
226
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]227div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]228span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]229a.image:visited { color: white; }
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]230
231dl {
232 margin-top: 0.8em;
233 margin-bottom: 0.8em;
234}
235dt {
236 margin-top: 0.5em;
237 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]238 font-style: normal;
239 color: navy;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]240}
241dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]242 margin-top: 0.1em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]243}
244
245ul, ol {
246 list-style-position: outside;
247}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]248ol.arabic {
249 list-style-type: decimal;
250}
251ol.loweralpha {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]252 list-style-type: lower-alpha;
253}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]254ol.upperalpha {
255 list-style-type: upper-alpha;
256}
257ol.lowerroman {
258 list-style-type: lower-roman;
259}
260ol.upperroman {
261 list-style-type: upper-roman;
262}
263
264div.compact ul, div.compact ol,
265div.compact p, div.compact p,
266div.compact div, div.compact div {
267 margin-top: 0.1em;
268 margin-bottom: 0.1em;
269}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]270
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]271tfoot {
272 font-weight: bold;
273}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]274td > div.verse {
275 white-space: pre;
276}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]277
278div.hdlist {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]279 margin-top: 0.8em;
280 margin-bottom: 0.8em;
281}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]282div.hdlist tr {
283 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]284}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]285dt.hdlist1.strong, td.hdlist1.strong {
286 font-weight: bold;
287}
288td.hdlist1 {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]289 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]290 font-style: normal;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]291 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]292 color: navy;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]293}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]294td.hdlist2 {
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]295 vertical-align: top;
296}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]297div.hdlist.compact tr {
298 margin: 0;
299 padding-bottom: 0;
300}
301
302.comment {
303 background: yellow;
304}
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]305
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]306.footnote, .footnoteref {
307 font-size: 0.8em;
308}
309
310span.footnote, span.footnoteref {
311 vertical-align: super;
312}
313
314#footnotes {
315 margin: 20px 0 20px 0;
316 padding: 7px 0 0 0;
317}
318
319#footnotes div.footnote {
320 margin: 0 0 5px 0;
321}
322
323#footnotes hr {
324 border: none;
325 border-top: 1px solid silver;
326 height: 1px;
327 text-align: left;
328 margin-left: 0;
329 width: 20%;
330 min-width: 100px;
331}
332
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]333div.colist td {
334 padding-right: 0.5em;
335 padding-bottom: 0.3em;
336 vertical-align: top;
337}
338div.colist td img {
339 margin-top: 0.3em;
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]340}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]341
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]342@media print {
343 #footer-badges { display: none; }
344}
345
346#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347 margin-bottom: 2.5em;
348}
349
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]350#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]352 font-size: 1.1em;
353 font-weight: bold;
354 margin-top: 1.0em;
355 margin-bottom: 0.1em;
356}
357
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]358div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]359 margin-top: 0;
360 margin-bottom: 0;
361}
362div.toclevel2 {
363 margin-left: 2em;
364 font-size: 0.9em;
365}
366div.toclevel3 {
367 margin-left: 4em;
368 font-size: 0.9em;
369}
370div.toclevel4 {
371 margin-left: 6em;
372 font-size: 0.9em;
373}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]374
375span.aqua { color: aqua; }
376span.black { color: black; }
377span.blue { color: blue; }
378span.fuchsia { color: fuchsia; }
379span.gray { color: gray; }
380span.green { color: green; }
381span.lime { color: lime; }
382span.maroon { color: maroon; }
383span.navy { color: navy; }
384span.olive { color: olive; }
385span.purple { color: purple; }
386span.red { color: red; }
387span.silver { color: silver; }
388span.teal { color: teal; }
389span.white { color: white; }
390span.yellow { color: yellow; }
391
392span.aqua-background { background: aqua; }
393span.black-background { background: black; }
394span.blue-background { background: blue; }
395span.fuchsia-background { background: fuchsia; }
396span.gray-background { background: gray; }
397span.green-background { background: green; }
398span.lime-background { background: lime; }
399span.maroon-background { background: maroon; }
400span.navy-background { background: navy; }
401span.olive-background { background: olive; }
402span.purple-background { background: purple; }
403span.red-background { background: red; }
404span.silver-background { background: silver; }
405span.teal-background { background: teal; }
406span.white-background { background: white; }
407span.yellow-background { background: yellow; }
408
409span.big { font-size: 2em; }
410span.small { font-size: 0.6em; }
411
412span.underline { text-decoration: underline; }
413span.overline { text-decoration: overline; }
414span.line-through { text-decoration: line-through; }
415
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]416div.unbreakable { page-break-inside: avoid; }
417
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]418
419/*
420 * xhtml11 specific
421 *
422 * */
423
424div.tableblock {
425 margin-top: 1.0em;
426 margin-bottom: 1.5em;
427}
428div.tableblock > table {
429 border: 3px solid #527bbd;
430}
431thead, p.table.header {
432 font-weight: bold;
433 color: #527bbd;
434}
435p.table {
436 margin-top: 0;
437}
438/* Because the table frame attribute is overriden by CSS in most browsers. */
439div.tableblock > table[frame="void"] {
440 border-style: none;
441}
442div.tableblock > table[frame="hsides"] {
443 border-left-style: none;
444 border-right-style: none;
445}
446div.tableblock > table[frame="vsides"] {
447 border-top-style: none;
448 border-bottom-style: none;
449}
450
451
452/*
453 * html5 specific
454 *
455 * */
456
457table.tableblock {
458 margin-top: 1.0em;
459 margin-bottom: 1.5em;
460}
461thead, p.tableblock.header {
462 font-weight: bold;
463 color: #527bbd;
464}
465p.tableblock {
466 margin-top: 0;
467}
468table.tableblock {
469 border-width: 3px;
470 border-spacing: 0px;
471 border-style: solid;
472 border-color: #527bbd;
473 border-collapse: collapse;
474}
475th.tableblock, td.tableblock {
476 border-width: 1px;
477 padding: 4px;
478 border-style: solid;
479 border-color: #527bbd;
480}
481
482table.tableblock.frame-topbot {
483 border-left-style: hidden;
484 border-right-style: hidden;
485}
486table.tableblock.frame-sides {
487 border-top-style: hidden;
488 border-bottom-style: hidden;
489}
490table.tableblock.frame-none {
491 border-style: hidden;
492}
493
494th.tableblock.halign-left, td.tableblock.halign-left {
495 text-align: left;
496}
497th.tableblock.halign-center, td.tableblock.halign-center {
498 text-align: center;
499}
500th.tableblock.halign-right, td.tableblock.halign-right {
501 text-align: right;
502}
503
504th.tableblock.valign-top, td.tableblock.valign-top {
505 vertical-align: top;
506}
507th.tableblock.valign-middle, td.tableblock.valign-middle {
508 vertical-align: middle;
509}
510th.tableblock.valign-bottom, td.tableblock.valign-bottom {
511 vertical-align: bottom;
512}
513
514
515/*
516 * manpage specific
517 *
518 * */
519
520body.manpage h1 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]521 padding-top: 0.5em;
522 padding-bottom: 0.5em;
523 border-top: 2px solid silver;
524 border-bottom: 2px solid silver;
525}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]526body.manpage h2 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]527 border-style: none;
528}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]529body.manpage div.sectionbody {
530 margin-left: 3em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]531}
532
533@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]534 body.manpage div#toc { display: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]535}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]536
537
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]538</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539<script type="text/javascript">
540/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]541var asciidoc = { // Namespace.
542
543/////////////////////////////////////////////////////////////////////
544// Table Of Contents generator
545/////////////////////////////////////////////////////////////////////
546
547/* Author: Mihai Bazon, September 2002
548 * http://students.infoiasi.ro/~mishoo
549 *
550 * Table Of Content generator
551 * Version: 0.4
552 *
553 * Feel free to use this script under the terms of the GNU General Public
554 * License, as long as you do not remove or alter this notice.
555 */
556
557 /* modified by Troy D. Hanson, September 2006. License: GPL */
558 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
559
560// toclevels = 1..4.
561toc: function (toclevels) {
562
563 function getText(el) {
564 var text = "";
565 for (var i = el.firstChild; i != null; i = i.nextSibling) {
566 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
567 text += i.data;
568 else if (i.firstChild != null)
569 text += getText(i);
570 }
571 return text;
572 }
573
574 function TocEntry(el, text, toclevel) {
575 this.element = el;
576 this.text = text;
577 this.toclevel = toclevel;
578 }
579
580 function tocEntries(el, toclevels) {
581 var result = new Array;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]582 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]583 // Function that scans the DOM tree for header elements (the DOM2
584 // nodeIterator API would be a better technique but not supported by all
585 // browsers).
586 var iterate = function (el) {
587 for (var i = el.firstChild; i != null; i = i.nextSibling) {
588 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
589 var mo = re.exec(i.tagName);
590 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
591 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
592 }
593 iterate(i);
594 }
595 }
596 }
597 iterate(el);
598 return result;
599 }
600
601 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]602 if (!toc) {
603 return;
604 }
605
606 // Delete existing TOC entries in case we're reloading the TOC.
607 var tocEntriesToRemove = [];
608 var i;
609 for (i = 0; i < toc.childNodes.length; i++) {
610 var entry = toc.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]611 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]612 && entry.getAttribute("class")
613 && entry.getAttribute("class").match(/^toclevel/))
614 tocEntriesToRemove.push(entry);
615 }
616 for (i = 0; i < tocEntriesToRemove.length; i++) {
617 toc.removeChild(tocEntriesToRemove[i]);
618 }
619
620 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]621 var entries = tocEntries(document.getElementById("content"), toclevels);
622 for (var i = 0; i < entries.length; ++i) {
623 var entry = entries[i];
624 if (entry.element.id == "")
625 entry.element.id = "_toc_" + i;
626 var a = document.createElement("a");
627 a.href = "#" + entry.element.id;
628 a.appendChild(document.createTextNode(entry.text));
629 var div = document.createElement("div");
630 div.appendChild(a);
631 div.className = "toclevel" + entry.toclevel;
632 toc.appendChild(div);
633 }
634 if (entries.length == 0)
635 toc.parentNode.removeChild(toc);
636},
637
638
639/////////////////////////////////////////////////////////////////////
640// Footnotes generator
641/////////////////////////////////////////////////////////////////////
642
643/* Based on footnote generation code from:
644 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
645 */
646
647footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]648 // Delete existing footnote entries in case we're reloading the footnodes.
649 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]650 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]651 if (!noteholder) {
652 return;
653 }
654 var entriesToRemove = [];
655 for (i = 0; i < noteholder.childNodes.length; i++) {
656 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]657 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]658 entriesToRemove.push(entry);
659 }
660 for (i = 0; i < entriesToRemove.length; i++) {
661 noteholder.removeChild(entriesToRemove[i]);
662 }
663
664 // Rebuild footnote entries.
665 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]666 var spans = cont.getElementsByTagName("span");
667 var refs = {};
668 var n = 0;
669 for (i=0; i<spans.length; i++) {
670 if (spans[i].className == "footnote") {
671 n++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]672 var note = spans[i].getAttribute("data-note");
673 if (!note) {
674 // Use [\s\S] in place of . so multi-line matches work.
675 // Because JavaScript has no s (dotall) regex flag.
676 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
677 spans[i].innerHTML =
678 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
679 "' title='View footnote' class='footnote'>" + n + "</a>]";
680 spans[i].setAttribute("data-note", note);
681 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]682 noteholder.innerHTML +=
683 "<div class='footnote' id='_footnote_" + n + "'>" +
684 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
685 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]686 var id =spans[i].getAttribute("id");
687 if (id != null) refs["#"+id] = n;
688 }
689 }
690 if (n == 0)
691 noteholder.parentNode.removeChild(noteholder);
692 else {
693 // Process footnoterefs.
694 for (i=0; i<spans.length; i++) {
695 if (spans[i].className == "footnoteref") {
696 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
697 href = href.match(/#.*/)[0]; // Because IE return full URL.
698 n = refs[href];
699 spans[i].innerHTML =
700 "[<a href='#_footnote_" + n +
701 "' title='View footnote' class='footnote'>" + n + "</a>]";
702 }
703 }
704 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]705},
706
707install: function(toclevels) {
708 var timerId;
709
710 function reinstall() {
711 asciidoc.footnotes();
712 if (toclevels) {
713 asciidoc.toc(toclevels);
714 }
715 }
716
717 function reinstallAndRemoveTimer() {
718 clearInterval(timerId);
719 reinstall();
720 }
721
722 timerId = setInterval(reinstall, 500);
723 if (document.addEventListener)
724 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
725 else
726 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]727}
728
729}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]730asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]731/*]]>*/
732</script>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]733</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]734<body class="manpage">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]735<div id="header">
736<h1>
737git-stash(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-stash -
742 Stash the changes in a dirty working directory away
743</p>
744</div>
745</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]746<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]747<div class="sect1">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]748<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]749<div class="sectionbody">
750<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]751<pre class="content"><em>git stash</em> list [&lt;options&gt;]
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]752<em>git stash</em> show [&lt;stash&gt;]
753<em>git stash</em> drop [-q|--quiet] [&lt;stash&gt;]
754<em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [&lt;stash&gt;]
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]755<em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]
Junio C Hamano50757392013-06-27 22:26:58[diff] [blame]756<em>git stash</em> [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
Junio C Hamano8a914312013-08-14 20:47:41[diff] [blame]757 [-u|--include-untracked] [-a|--all] [&lt;message&gt;]]
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]758<em>git stash</em> clear
Junio C Hamano50757392013-06-27 22:26:58[diff] [blame]759<em>git stash</em> create [&lt;message&gt;]
760<em>git stash</em> store [-m|--message &lt;message&gt;] [-q|--quiet] &lt;commit&gt;</pre>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]761<div class="attribution">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]762</div></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]763</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]764</div>
765<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]766<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]767<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]768<div class="paragraph"><p>Use <code>git stash</code> when you want to record the current state of the
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]769working directory and the index, but want to go back to a clean
770working directory. The command saves your local modifications away
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]771and reverts the working directory to match the <code>HEAD</code> commit.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]772<div class="paragraph"><p>The modifications stashed away by this command can be listed with
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]773<code>git stash list</code>, inspected with <code>git stash show</code>, and restored
774(potentially on top of a different commit) with <code>git stash apply</code>.
775Calling <code>git stash</code> without any arguments is equivalent to <code>git stash save</code>.
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]776A stash is by default listed as "WIP on <em>branchname</em> &#8230;", but
Junio C Hamanobb6e0782007-07-19 02:14:50[diff] [blame]777you can give a more descriptive message on the command line when
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]778you create one.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]779<div class="paragraph"><p>The latest stash you created is stored in <code>refs/stash</code>; older
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]780stashes are found in the reflog of this reference and can be named using
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]781the usual reflog syntax (e.g. <code>stash@{0}</code> is the most recently
782created stash, <code>stash@{1}</code> is the one before it, <code>stash@{2.hours.ago}</code>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]783is also possible).</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]784</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]785</div>
786<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]787<h2 id="_options">OPTIONS</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]788<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]789<div class="dlist"><dl>
790<dt class="hdlist1">
Junio C Hamano81703b22014-03-14 22:00:27[diff] [blame]791save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]792</dt>
793<dd>
794<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]795 Save your local modifications to a new <em>stash</em>, and run <code>git reset
796 --hard</code> to revert them. The &lt;message&gt; part is optional and gives
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]797 the description along with the stashed state. For quickly making
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]798 a snapshot, you can omit <em>both</em> "save" and &lt;message&gt;, but giving
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]799 only &lt;message&gt; does not trigger this action to prevent a misspelled
800 subcommand from making an unwanted stash.
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]801</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]802<div class="paragraph"><p>If the <code>--keep-index</code> option is used, all changes already added to the
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]803index are left intact.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]804<div class="paragraph"><p>If the <code>--include-untracked</code> option is used, all untracked files are also
805stashed and then cleaned up with <code>git clean</code>, leaving the working directory
806in a very clean state. If the <code>--all</code> option is used instead then the
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]807ignored files are stashed and cleaned in addition to the untracked files.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]808<div class="paragraph"><p>With <code>--patch</code>, you can interactively select hunks from the diff
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]809between HEAD and the working tree to be stashed. The stash entry is
810constructed such that its index state is the same as the index state
811of your repository, and its worktree contains only the changes you
812selected interactively. The selected changes are then rolled back
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]813from your worktree. See the &#8220;Interactive Mode&#8221; section of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]814<a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p></div>
815<div class="paragraph"><p>The <code>--patch</code> option implies <code>--keep-index</code>. You can use
816<code>--no-keep-index</code> to override this.</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]817</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]818<dt class="hdlist1">
Junio C Hamano83d46a22008-02-21 02:29:42[diff] [blame]819list [&lt;options&gt;]
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]820</dt>
821<dd>
822<p>
823 List the stashes that you currently have. Each <em>stash</em> is listed
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]824 with its name (e.g. <code>stash@{0}</code> is the latest stash, <code>stash@{1}</code> is
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]825 the one before, etc.), the name of the branch that was current when the
826 stash was made, and a short description of the commit the stash was
827 based on.
828</p>
829<div class="listingblock">
830<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]831<pre><code>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
832stash@{1}: On master: 9cc0589... Add git-stash</code></pre>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]833</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]834<div class="paragraph"><p>The command takes options applicable to the <em>git log</em>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]835command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]836</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]837<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]838show [&lt;stash&gt;]
839</dt>
840<dd>
841<p>
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]842 Show the changes recorded in the stash as a diff between the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]843 stashed state and its original parent. When no <code>&lt;stash&gt;</code> is given,
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]844 shows the latest one. By default, the command shows the diffstat, but
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]845 it will accept any format known to <em>git diff</em> (e.g., <code>git stash show
846 -p stash@{1}</code> to view the second most recent stash in patch form).
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]847</p>
848</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]849<dt class="hdlist1">
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]850pop [--index] [-q|--quiet] [&lt;stash&gt;]
Junio C Hamano7d3275e2009-05-31 21:53:30[diff] [blame]851</dt>
852<dd>
853<p>
854 Remove a single stashed state from the stash list and apply it
855 on top of the current working tree state, i.e., do the inverse
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]856 operation of <code>git stash save</code>. The working directory must
Junio C Hamano7d3275e2009-05-31 21:53:30[diff] [blame]857 match the index.
858</p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]859<div class="paragraph"><p>Applying the state can fail with conflicts; in this case, it is not
Junio C Hamano7d3275e2009-05-31 21:53:30[diff] [blame]860removed from the stash list. You need to resolve the conflicts by hand
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]861and call <code>git stash drop</code> manually afterwards.</p></div>
862<div class="paragraph"><p>If the <code>--index</code> option is used, then tries to reinstate not only the working
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]863tree&#8217;s changes, but also the index&#8217;s ones. However, this can fail, when you
Junio C Hamanof068d542009-06-09 15:46:41[diff] [blame]864have conflicts (which are stored in the index, where you therefore can no
865longer apply the changes as they were originally).</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]866<div class="paragraph"><p>When no <code>&lt;stash&gt;</code> is given, <code>stash@{0}</code> is assumed, otherwise <code>&lt;stash&gt;</code> must
867be a reference of the form <code>stash@{&lt;revision&gt;}</code>.</p></div>
Junio C Hamano7d3275e2009-05-31 21:53:30[diff] [blame]868</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]869<dt class="hdlist1">
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]870apply [--index] [-q|--quiet] [&lt;stash&gt;]
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]871</dt>
872<dd>
873<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]874 Like <code>pop</code>, but do not remove the state from the stash list. Unlike <code>pop</code>,
875 <code>&lt;stash&gt;</code> may be any commit that looks like a commit created by
876 <code>stash save</code> or <code>stash create</code>.
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]877</p>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]878</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]879<dt class="hdlist1">
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]880branch &lt;branchname&gt; [&lt;stash&gt;]
881</dt>
882<dd>
883<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]884 Creates and checks out a new branch named <code>&lt;branchname&gt;</code> starting from
885 the commit at which the <code>&lt;stash&gt;</code> was originally created, applies the
886 changes recorded in <code>&lt;stash&gt;</code> to the new working tree and index.
887 If that succeeds, and <code>&lt;stash&gt;</code> is a reference of the form
888 <code>stash@{&lt;revision&gt;}</code>, it then drops the <code>&lt;stash&gt;</code>. When no <code>&lt;stash&gt;</code>
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]889 is given, applies the latest one.
890</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]891<div class="paragraph"><p>This is useful if the branch on which you ran <code>git stash save</code> has
892changed enough that <code>git stash apply</code> fails due to conflicts. Since
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]893the stash is applied on top of the commit that was HEAD at the time
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]894<code>git stash</code> was run, it restores the originally stashed state with
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]895no conflicts.</p></div>
896</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]897<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]898clear
899</dt>
900<dd>
901<p>
902 Remove all the stashed states. Note that those states will then
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]903 be subject to pruning, and may be impossible to recover (see
904 <em>Examples</em> below for a possible strategy).
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]905</p>
906</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]907<dt class="hdlist1">
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]908drop [-q|--quiet] [&lt;stash&gt;]
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]909</dt>
910<dd>
911<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]912 Remove a single stashed state from the stash list. When no <code>&lt;stash&gt;</code>
913 is given, it removes the latest one. i.e. <code>stash@{0}</code>, otherwise
914 <code>&lt;stash&gt;</code> must be a valid stash log reference of the form
915 <code>stash@{&lt;revision&gt;}</code>.
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]916</p>
917</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]918<dt class="hdlist1">
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]919create
920</dt>
921<dd>
922<p>
923 Create a stash (which is a regular commit object) and return its
924 object name, without storing it anywhere in the ref namespace.
Junio C Hamano50757392013-06-27 22:26:58[diff] [blame]925 This is intended to be useful for scripts. It is probably not
926 the command you want to use; see "save" above.
927</p>
928</dd>
929<dt class="hdlist1">
930store
931</dt>
932<dd>
933<p>
934 Store a given stash created via <em>git stash create</em> (which is a
935 dangling merge commit) in the stash ref, updating the stash
936 reflog. This is intended to be useful for scripts. It is
937 probably not the command you want to use; see "save" above.
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]938</p>
939</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]940</dl></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]941</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]942</div>
943<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]944<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]945<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]946<div class="paragraph"><p>A stash is represented as a commit whose tree records the state of the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]947working directory, and its first parent is the commit at <code>HEAD</code> when
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]948the stash was created. The tree of the second parent records the
949state of the index when the stash is made, and it is made a child of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]950the <code>HEAD</code> commit. The ancestry graph looks like this:</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]951<div class="literalblock">
952<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]953<pre><code> .----W
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]954 / /
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]955-----H----I</code></pre>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]956</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]957<div class="paragraph"><p>where <code>H</code> is the <code>HEAD</code> commit, <code>I</code> is a commit that records the state
958of the index, and <code>W</code> is a commit that records the state of the working
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]959tree.</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]960</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]961</div>
962<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]963<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]964<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]965<div class="dlist"><dl>
966<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]967Pulling into a dirty tree
968</dt>
969<dd>
970<p>
971When you are in the middle of something, you learn that there are
972upstream changes that are possibly relevant to what you are
973doing. When your local changes do not conflict with the changes in
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]974the upstream, a simple <code>git pull</code> will let you move forward.
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]975</p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]976<div class="paragraph"><p>However, there are cases in which your local changes do conflict with
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]977the upstream changes, and <code>git pull</code> refuses to overwrite your
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]978changes. In such a case, you can stash your changes away,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]979perform a pull, and then unstash, like this:</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]980<div class="listingblock">
981<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]982<pre><code>$ git pull
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]983 ...
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]984file foobar not up to date, cannot merge.
985$ git stash
986$ git pull
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]987$ git stash pop</code></pre>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]988</div></div>
989</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]990<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]991Interrupted workflow
992</dt>
993<dd>
994<p>
995When you are in the middle of something, your boss comes in and
996demands that you fix something immediately. Traditionally, you would
997make a commit to a temporary branch to store your changes away, and
998return to your original branch to make the emergency fix, like this:
999</p>
1000<div class="listingblock">
1001<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1002<pre><code># ... hack hack hack ...
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1003$ git checkout -b my_wip
1004$ git commit -a -m "WIP"
1005$ git checkout master
1006$ edit emergency fix
1007$ git commit -a -m "Fix in a hurry"
1008$ git checkout my_wip
1009$ git reset --soft HEAD^
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1010# ... continue hacking ...</code></pre>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1011</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1012<div class="paragraph"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1013<div class="listingblock">
1014<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1015<pre><code># ... hack hack hack ...
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1016$ git stash
1017$ edit emergency fix
1018$ git commit -a -m "Fix in a hurry"
Junio C Hamano7d3275e2009-05-31 21:53:30[diff] [blame]1019$ git stash pop
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1020# ... continue hacking ...</code></pre>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1021</div></div>
1022</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1023<dt class="hdlist1">
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1024Testing partial commits
1025</dt>
1026<dd>
1027<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1028You can use <code>git stash save --keep-index</code> when you want to make two or
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1029more commits out of the changes in the work tree, and you want to test
1030each change before committing:
1031</p>
1032<div class="listingblock">
1033<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1034<pre><code># ... hack hack hack ...
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1035$ git add --patch foo # add just first part to the index
1036$ git stash save --keep-index # save all other changes to the stash
1037$ edit/build/test first part
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1038$ git commit -m 'First part' # commit fully tested change
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1039$ git stash pop # prepare to work on all other changes
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1040# ... repeat above five steps until one commit remains ...
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1041$ edit/build/test remaining parts
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1042$ git commit foo -m 'Remaining parts'</code></pre>
Junio C Hamano46a38aa2008-07-14 03:13:27[diff] [blame]1043</div></div>
1044</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1045<dt class="hdlist1">
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]1046Recovering stashes that were cleared/dropped erroneously
1047</dt>
1048<dd>
1049<p>
1050If you mistakenly drop or clear stashes, they cannot be recovered
1051through the normal safety mechanisms. However, you can try the
1052following incantation to get a list of stashes that are still in your
1053repository, but not reachable any more:
1054</p>
1055<div class="listingblock">
1056<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1057<pre><code>git fsck --unreachable |
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]1058grep commit | cut -d\ -f3 |
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1059xargs git log --merges --no-walk --grep=WIP</code></pre>
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]1060</div></div>
1061</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1062</dl></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1063</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1064</div>
1065<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1066<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1067<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1068<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
1069<a href="git-commit.html">git-commit(1)</a>,
1070<a href="git-reflog.html">git-reflog(1)</a>,
1071<a href="git-reset.html">git-reset(1)</a></p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1072</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1073</div>
1074<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1075<h2 id="_git">GIT</h2>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1076<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1077<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1078</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1079</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1080</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1081<div id="footnotes"><hr /></div>
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1082<div id="footer">
1083<div id="footer-text">
Junio C Hamano81703b22014-03-14 22:00:27[diff] [blame]1084Last updated 2014-03-14 14:59:49 PDT
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1085</div>
1086</div>
1087</body>
1088</html>