Google Git
Sign in
chromium / external / gitster / git-htmldocs / bcd98f41a1bf21a71ee80e4b1f381e1290909b66 / . / git-rerere.html
blob: d9dcd4c6e86fe62fb080c65d132daad9ec239fc5 [file] [log] [blame]
Junio C Hamano40f2f8d2006-02-07 08:04:39[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-rerere(1)</title>
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]40 color: navy;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]45 color: #083194;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]46}
47
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]70
71div.sectionbody {
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]100
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]101#author {
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]102 color: #527bbd;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]103 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]104 font-size: 1.1em;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#email {
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]107}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]108#revnumber, #revdate, #revremark {
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]109}
110
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]111#footer {
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]225}
226
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]240}
241dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]242 margin-top: 0.1em;
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]270
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]289 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]290 font-style: normal;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]291 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]292 color: navy;
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]293}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]294td.hdlist2 {
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]733</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]734<body class="manpage">
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]735<div id="header">
736<h1>
737git-rerere(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-rerere -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]742 Reuse recorded resolution of conflicted merges
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]749<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]750<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]751<pre class="content"><em>git rerere</em> [<em>clear</em>|<em>forget</em> &lt;pathspec&gt;|<em>diff</em>|<em>remaining</em>|<em>status</em>|<em>gc</em>]</pre>
752<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]753</div></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]754</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]755</div>
756<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]757<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]758<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]759<div class="paragraph"><p>In a workflow employing relatively long lived topic branches,
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]760the developer sometimes needs to resolve the same conflicts over
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]761and over again until the topic branches are done (either merged
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]762to the "release" branch, or sent out and accepted upstream).</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]763<div class="paragraph"><p>This command assists the developer in this process by recording
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]764conflicted automerge results and corresponding hand resolve results
765on the initial manual merge, and applying previously recorded
766hand resolutions to their corresponding automerge results.</p></div>
Junio C Hamano0e47b232008-01-15 08:31:10[diff] [blame]767<div class="admonitionblock">
768<table><tr>
769<td class="icon">
770<div class="title">Note</div>
771</td>
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]772<td class="content">You need to set the configuration variable rerere.enabled in order to
Junio C Hamano0e47b232008-01-15 08:31:10[diff] [blame]773enable this command.</td>
774</tr></table>
775</div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]776</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]777</div>
778<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]779<h2 id="_commands">COMMANDS</h2>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]780<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]781<div class="paragraph"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]782However, it has several commands that allow it to interact with
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]783its working state.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]784<div class="dlist"><dl>
785<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]786<em>clear</em>
787</dt>
788<dd>
789<p>
Junio C Hamanoc55452a2012-03-14 23:05:11[diff] [blame]790Reset the metadata used by rerere if a merge resolution is to be
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]791aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em>
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]792will automatically invoke this command.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]793</p>
794</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]795<dt class="hdlist1">
Junio C Hamano3e3aa812010-07-05 23:25:23[diff] [blame]796<em>forget</em> &lt;pathspec&gt;
797</dt>
798<dd>
799<p>
Junio C Hamanoc55452a2012-03-14 23:05:11[diff] [blame]800Reset the conflict resolutions which rerere has recorded for the current
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]801conflict in &lt;pathspec&gt;.
Junio C Hamano3e3aa812010-07-05 23:25:23[diff] [blame]802</p>
803</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]804<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]805<em>diff</em>
806</dt>
807<dd>
808<p>
Junio C Hamanoc55452a2012-03-14 23:05:11[diff] [blame]809Display diffs for the current state of the resolution. It is
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]810useful for tracking what has changed while the user is resolving
811conflicts. Additional arguments are passed directly to the system
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]812<em>diff</em> command installed in PATH.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]813</p>
814</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]815<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]816<em>status</em>
817</dt>
818<dd>
819<p>
Junio C Hamanoc55452a2012-03-14 23:05:11[diff] [blame]820Print paths with conflicts whose merge resolution rerere will record.
821</p>
822</dd>
823<dt class="hdlist1">
824<em>remaining</em>
825</dt>
826<dd>
827<p>
828Print paths with conflicts that have not been autoresolved by rerere.
829This includes paths whose resolutions cannot be tracked by rerere,
830such as conflicting submodules.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]831</p>
832</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]833<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]834<em>gc</em>
835</dt>
836<dd>
837<p>
Junio C Hamanoc55452a2012-03-14 23:05:11[diff] [blame]838Prune records of conflicted merges that
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]839occurred a long time ago. By default, unresolved conflicts older
840than 15 days and resolved conflicts older than 60
841days are pruned. These defaults are controlled via the
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]842<code>gc.rerereUnresolved</code> and <code>gc.rerereResolved</code> configuration
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]843variables respectively.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]844</p>
845</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]846</dl></div>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]847</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]848</div>
849<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]850<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]851<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]852<div class="paragraph"><p>When your topic branch modifies an overlapping area that your
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]853master branch (or upstream) touched since your topic branch
854forked from it, you may want to test it with the latest master,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]855even before your topic branch is ready to be pushed upstream:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]856<div class="listingblock">
857<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]858<pre><code> o---*---o topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]859 /
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]860 o---o---o---*---o---o master</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]861</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]862<div class="paragraph"><p>For such a test, you need to merge master and topic somehow.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]863One way to do it is to pull master into the topic branch:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]864<div class="listingblock">
865<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]866<pre><code> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]867 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]868
869 o---*---o---+ topic
870 / /
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]871 o---o---o---*---o---o master</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]872</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]873<div class="paragraph"><p>The commits marked with <code>*</code> touch the same area in the same
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]874file; you need to resolve the conflicts when creating the commit
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]875marked with <code>+</code>. Then you can test the result to make sure your
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]876work-in-progress still works with what is in the latest master.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]877<div class="paragraph"><p>After this test merge, there are two ways to continue your work
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]878on the topic. The easiest is to build on top of the test merge
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]879commit <code>+</code>, and when your work in the topic branch is finally
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]880ready, pull the topic branch into master, and/or ask the
881upstream to pull from you. By that time, however, the master or
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]882the upstream might have been advanced since the test merge <code>+</code>,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]883in which case the final commit graph would look like this:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]884<div class="listingblock">
885<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]886<pre><code> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]887 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]888 $ ... work on both topic and master branches
889 $ git checkout master
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]890 $ git merge topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]891
892 o---*---o---+---o---o topic
893 / / \
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]894 o---o---o---*---o---o---o---o---+ master</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]895</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]896<div class="paragraph"><p>When your topic branch is long-lived, however, your topic branch
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]897would end up having many such "Merge from master" commits on it,
898which would unnecessarily clutter the development history.
899Readers of the Linux kernel mailing list may remember that Linus
900complained about such too frequent test merges when a subsystem
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]901maintainer asked to pull from a branch full of "useless merges".</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]902<div class="paragraph"><p>As an alternative, to keep the topic branch clean of test
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]903merges, you could blow away the test merge, and keep building on
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]904top of the tip before the test merge:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]905<div class="listingblock">
906<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]907<pre><code> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]908 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]909 $ git reset --hard HEAD^ ;# rewind the test merge
910 $ ... work on both topic and master branches
911 $ git checkout master
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]912 $ git merge topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]913
914 o---*---o-------o---o topic
915 / \
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]916 o---o---o---*---o---o---o---o---+ master</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]917</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]918<div class="paragraph"><p>This would leave only one merge commit when your topic branch is
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]919finally ready and merged into the master branch. This merge
920would require you to resolve the conflict, introduced by the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]921commits marked with <code>*</code>. However, this conflict is often the
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]922same conflict you resolved when you created the test merge you
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]923blew away. <em>git rerere</em> helps you resolve this final
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]924conflicted merge using the information from your earlier hand
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]925resolve.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]926<div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]927automerge records the conflicted working tree files, with the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]928usual conflict markers <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code>, <code>=======</code>, and <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> in
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]929them. Later, after you are done resolving the conflicts,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]930running <em>git rerere</em> again will record the resolved state of these
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]931files. Suppose you did this when you created the test merge of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]932master into the topic branch.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]933<div class="paragraph"><p>Next time, after seeing the same conflicted automerge,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]934running <em>git rerere</em> will perform a three-way merge between the
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]935earlier conflicted automerge, the earlier manual resolution, and
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]936the current conflicted automerge.
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]937If this three-way merge resolves cleanly, the result is written
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]938out to your working tree file, so you do not have to manually
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]939resolve it. Note that <em>git rerere</em> leaves the index file alone,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]940so you still need to do the final sanity checks with <code>git diff</code>
941(or <code>git diff -c</code>) and <em>git add</em> when you are satisfied.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]942<div class="paragraph"><p>As a convenience measure, <em>git merge</em> automatically invokes
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]943<em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]944records the hand resolve when it is a new conflict, or reuses the earlier hand
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]945resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]946when committing a merge result. What this means is that you do
947not have to do anything special yourself (besides enabling
948the rerere.enabled config variable).</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]949<div class="paragraph"><p>In our example, when you do the test merge, the manual
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]950resolution is recorded, and it will be reused when you do the
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]951actual merge later with the updated master and topic branch, as long
952as the recorded resolution is still applicable.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]953<div class="paragraph"><p>The information <em>git rerere</em> records is also used when running
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]954<em>git rebase</em>. After blowing away the test merge and continuing
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]955development on the topic branch:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]956<div class="listingblock">
957<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]958<pre><code> o---*---o-------o---o topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]959 /
960 o---o---o---*---o---o---o---o master
961
962 $ git rebase master topic
963
964 o---*---o-------o---o topic
965 /
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]966 o---o---o---*---o---o---o---o master</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]967</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]968<div class="paragraph"><p>you could run <code>git rebase master topic</code>, to bring yourself
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]969up-to-date before your topic is ready to be sent upstream.
970This would result in falling back to a three-way merge, and it
971would conflict the same way as the test merge you resolved earlier.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]972<em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]973conflict.</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]974</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]975</div>
976<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]977<h2 id="_git">GIT</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]978<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]979<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]980</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]981</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]982</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]983<div id="footnotes"><hr /></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]984<div id="footer">
985<div id="footer-text">
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]986Last updated 2015-03-23 14:31:16 PDT
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]987</div>
988</div>
989</body>
990</html>