Google Git
Sign in
chromium / external / gitster / git-htmldocs / 211db89d8b8d8c3006e084f43dd6471163c7b998 / . / git-merge-file.html
blob: 3178c473536fca8c5f253220108c8e8121e5726d [file] [log] [blame]
Junio C Hamano1de7bc62006-12-17 19:31:54[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" />
6<meta name="generator" content="AsciiDoc 8.6.8" />
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]7<title>git-merge-file(1)</title>
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]40 color: navy;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]45 color: #083194;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]46}
47
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]70
71div.sectionbody {
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano9d971152012-12-19 00:43:11[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]94 padding: 0;
95 margin: 0;
96}
97
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]98
99#author {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]100 color: #527bbd;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]101 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]102 font-size: 1.1em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]103}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]104#email {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#revnumber, #revdate, #revremark {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]107}
108
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]109#footer {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]110 font-size: small;
111 border-top: 2px solid silver;
112 padding-top: 0.5em;
113 margin-top: 4.0em;
114}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]115#footer-text {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]116 float: left;
117 padding-bottom: 0.5em;
118}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]119#footer-badges {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]120 float: right;
121 padding-bottom: 0.5em;
122}
123
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]124#preamble {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]125 margin-top: 1.5em;
126 margin-bottom: 1.5em;
127}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]128div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]129div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
130div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]131 margin-top: 1.0em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]132 margin-bottom: 1.5em;
133}
134div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]135 margin-top: 2.0em;
136 margin-bottom: 2.0em;
137 margin-right: 10%;
138 color: #606060;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]139}
140
141div.content { /* Block element content. */
142 padding: 0;
143}
144
145/* Block element titles. */
146div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]147 color: #527bbd;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]148 font-weight: bold;
149 text-align: left;
150 margin-top: 1.0em;
151 margin-bottom: 0.5em;
152}
153div.title + * {
154 margin-top: 0;
155}
156
157td div.title:first-child {
158 margin-top: 0.0em;
159}
160div.content div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content + div.title {
164 margin-top: 0.0em;
165}
166
167div.sidebarblock > div.content {
168 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]169 border: 1px solid #dddddd;
170 border-left: 4px solid #f0f0f0;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]171 padding: 0.5em;
172}
173
174div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]175 border: 1px solid #dddddd;
176 border-left: 5px solid #f0f0f0;
177 background: #f8f8f8;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]178 padding: 0.5em;
179}
180
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]181div.quoteblock, div.verseblock {
182 padding-left: 1.0em;
183 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]184 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]185 border-left: 5px solid #f0f0f0;
186 color: #888;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]187}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]188
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]189div.quoteblock > div.attribution {
190 padding-top: 0.5em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]191 text-align: right;
192}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]193
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]194div.verseblock > pre.content {
195 font-family: inherit;
196 font-size: inherit;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]197}
198div.verseblock > div.attribution {
199 padding-top: 0.75em;
200 text-align: left;
201}
202/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]203div.verseblock + div.attribution {
204 text-align: left;
205}
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]206
207div.admonitionblock .icon {
208 vertical-align: top;
209 font-size: 1.1em;
210 font-weight: bold;
211 text-decoration: underline;
212 color: #527bbd;
213 padding-right: 0.5em;
214}
215div.admonitionblock td.content {
216 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]217 border-left: 3px solid #dddddd;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]218}
219
220div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]221 border-left: 3px solid #dddddd;
222 padding-left: 0.5em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]223}
224
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]225div.imageblock div.content { padding-left: 0; }
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]226span.image img { border-style: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]227a.image:visited { color: white; }
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]228
229dl {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
233dt {
234 margin-top: 0.5em;
235 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]236 font-style: normal;
237 color: navy;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]238}
239dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]240 margin-top: 0.1em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]241}
242
243ul, ol {
244 list-style-position: outside;
245}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]246ol.arabic {
247 list-style-type: decimal;
248}
249ol.loweralpha {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]250 list-style-type: lower-alpha;
251}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]252ol.upperalpha {
253 list-style-type: upper-alpha;
254}
255ol.lowerroman {
256 list-style-type: lower-roman;
257}
258ol.upperroman {
259 list-style-type: upper-roman;
260}
261
262div.compact ul, div.compact ol,
263div.compact p, div.compact p,
264div.compact div, div.compact div {
265 margin-top: 0.1em;
266 margin-bottom: 0.1em;
267}
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]268
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]269tfoot {
270 font-weight: bold;
271}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]272td > div.verse {
273 white-space: pre;
274}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]275
276div.hdlist {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]277 margin-top: 0.8em;
278 margin-bottom: 0.8em;
279}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]280div.hdlist tr {
281 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]282}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]283dt.hdlist1.strong, td.hdlist1.strong {
284 font-weight: bold;
285}
286td.hdlist1 {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]287 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]288 font-style: normal;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]289 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]290 color: navy;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]291}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]292td.hdlist2 {
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]293 vertical-align: top;
294}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]295div.hdlist.compact tr {
296 margin: 0;
297 padding-bottom: 0;
298}
299
300.comment {
301 background: yellow;
302}
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]303
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]304.footnote, .footnoteref {
305 font-size: 0.8em;
306}
307
308span.footnote, span.footnoteref {
309 vertical-align: super;
310}
311
312#footnotes {
313 margin: 20px 0 20px 0;
314 padding: 7px 0 0 0;
315}
316
317#footnotes div.footnote {
318 margin: 0 0 5px 0;
319}
320
321#footnotes hr {
322 border: none;
323 border-top: 1px solid silver;
324 height: 1px;
325 text-align: left;
326 margin-left: 0;
327 width: 20%;
328 min-width: 100px;
329}
330
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]331div.colist td {
332 padding-right: 0.5em;
333 padding-bottom: 0.3em;
334 vertical-align: top;
335}
336div.colist td img {
337 margin-top: 0.3em;
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]338}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]339
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]340@media print {
341 #footer-badges { display: none; }
342}
343
344#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]345 margin-bottom: 2.5em;
346}
347
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]348#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]349 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]350 font-size: 1.1em;
351 font-weight: bold;
352 margin-top: 1.0em;
353 margin-bottom: 0.1em;
354}
355
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]356div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]357 margin-top: 0;
358 margin-bottom: 0;
359}
360div.toclevel2 {
361 margin-left: 2em;
362 font-size: 0.9em;
363}
364div.toclevel3 {
365 margin-left: 4em;
366 font-size: 0.9em;
367}
368div.toclevel4 {
369 margin-left: 6em;
370 font-size: 0.9em;
371}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]372
373span.aqua { color: aqua; }
374span.black { color: black; }
375span.blue { color: blue; }
376span.fuchsia { color: fuchsia; }
377span.gray { color: gray; }
378span.green { color: green; }
379span.lime { color: lime; }
380span.maroon { color: maroon; }
381span.navy { color: navy; }
382span.olive { color: olive; }
383span.purple { color: purple; }
384span.red { color: red; }
385span.silver { color: silver; }
386span.teal { color: teal; }
387span.white { color: white; }
388span.yellow { color: yellow; }
389
390span.aqua-background { background: aqua; }
391span.black-background { background: black; }
392span.blue-background { background: blue; }
393span.fuchsia-background { background: fuchsia; }
394span.gray-background { background: gray; }
395span.green-background { background: green; }
396span.lime-background { background: lime; }
397span.maroon-background { background: maroon; }
398span.navy-background { background: navy; }
399span.olive-background { background: olive; }
400span.purple-background { background: purple; }
401span.red-background { background: red; }
402span.silver-background { background: silver; }
403span.teal-background { background: teal; }
404span.white-background { background: white; }
405span.yellow-background { background: yellow; }
406
407span.big { font-size: 2em; }
408span.small { font-size: 0.6em; }
409
410span.underline { text-decoration: underline; }
411span.overline { text-decoration: overline; }
412span.line-through { text-decoration: line-through; }
413
414div.unbreakable { page-break-inside: avoid; }
415
416
417/*
418 * xhtml11 specific
419 *
420 * */
421
422div.tableblock {
423 margin-top: 1.0em;
424 margin-bottom: 1.5em;
425}
426div.tableblock > table {
427 border: 3px solid #527bbd;
428}
429thead, p.table.header {
430 font-weight: bold;
431 color: #527bbd;
432}
433p.table {
434 margin-top: 0;
435}
436/* Because the table frame attribute is overriden by CSS in most browsers. */
437div.tableblock > table[frame="void"] {
438 border-style: none;
439}
440div.tableblock > table[frame="hsides"] {
441 border-left-style: none;
442 border-right-style: none;
443}
444div.tableblock > table[frame="vsides"] {
445 border-top-style: none;
446 border-bottom-style: none;
447}
448
449
450/*
451 * html5 specific
452 *
453 * */
454
455table.tableblock {
456 margin-top: 1.0em;
457 margin-bottom: 1.5em;
458}
459thead, p.tableblock.header {
460 font-weight: bold;
461 color: #527bbd;
462}
463p.tableblock {
464 margin-top: 0;
465}
466table.tableblock {
467 border-width: 3px;
468 border-spacing: 0px;
469 border-style: solid;
470 border-color: #527bbd;
471 border-collapse: collapse;
472}
473th.tableblock, td.tableblock {
474 border-width: 1px;
475 padding: 4px;
476 border-style: solid;
477 border-color: #527bbd;
478}
479
480table.tableblock.frame-topbot {
481 border-left-style: hidden;
482 border-right-style: hidden;
483}
484table.tableblock.frame-sides {
485 border-top-style: hidden;
486 border-bottom-style: hidden;
487}
488table.tableblock.frame-none {
489 border-style: hidden;
490}
491
492th.tableblock.halign-left, td.tableblock.halign-left {
493 text-align: left;
494}
495th.tableblock.halign-center, td.tableblock.halign-center {
496 text-align: center;
497}
498th.tableblock.halign-right, td.tableblock.halign-right {
499 text-align: right;
500}
501
502th.tableblock.valign-top, td.tableblock.valign-top {
503 vertical-align: top;
504}
505th.tableblock.valign-middle, td.tableblock.valign-middle {
506 vertical-align: middle;
507}
508th.tableblock.valign-bottom, td.tableblock.valign-bottom {
509 vertical-align: bottom;
510}
511
512
513/*
514 * manpage specific
515 *
516 * */
517
518body.manpage h1 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]519 padding-top: 0.5em;
520 padding-bottom: 0.5em;
521 border-top: 2px solid silver;
522 border-bottom: 2px solid silver;
523}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]524body.manpage h2 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]525 border-style: none;
526}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]527body.manpage div.sectionbody {
528 margin-left: 3em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]529}
530
531@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]532 body.manpage div#toc { display: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]533}
534
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]535
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]536</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]537<script type="text/javascript">
538/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539var asciidoc = { // Namespace.
540
541/////////////////////////////////////////////////////////////////////
542// Table Of Contents generator
543/////////////////////////////////////////////////////////////////////
544
545/* Author: Mihai Bazon, September 2002
546 * http://students.infoiasi.ro/~mishoo
547 *
548 * Table Of Content generator
549 * Version: 0.4
550 *
551 * Feel free to use this script under the terms of the GNU General Public
552 * License, as long as you do not remove or alter this notice.
553 */
554
555 /* modified by Troy D. Hanson, September 2006. License: GPL */
556 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
557
558// toclevels = 1..4.
559toc: function (toclevels) {
560
561 function getText(el) {
562 var text = "";
563 for (var i = el.firstChild; i != null; i = i.nextSibling) {
564 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
565 text += i.data;
566 else if (i.firstChild != null)
567 text += getText(i);
568 }
569 return text;
570 }
571
572 function TocEntry(el, text, toclevel) {
573 this.element = el;
574 this.text = text;
575 this.toclevel = toclevel;
576 }
577
578 function tocEntries(el, toclevels) {
579 var result = new Array;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]580 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]581 // Function that scans the DOM tree for header elements (the DOM2
582 // nodeIterator API would be a better technique but not supported by all
583 // browsers).
584 var iterate = function (el) {
585 for (var i = el.firstChild; i != null; i = i.nextSibling) {
586 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
587 var mo = re.exec(i.tagName);
588 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
589 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
590 }
591 iterate(i);
592 }
593 }
594 }
595 iterate(el);
596 return result;
597 }
598
599 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]600 if (!toc) {
601 return;
602 }
603
604 // Delete existing TOC entries in case we're reloading the TOC.
605 var tocEntriesToRemove = [];
606 var i;
607 for (i = 0; i < toc.childNodes.length; i++) {
608 var entry = toc.childNodes[i];
609 if (entry.nodeName.toLowerCase() == 'div'
610 && entry.getAttribute("class")
611 && entry.getAttribute("class").match(/^toclevel/))
612 tocEntriesToRemove.push(entry);
613 }
614 for (i = 0; i < tocEntriesToRemove.length; i++) {
615 toc.removeChild(tocEntriesToRemove[i]);
616 }
617
618 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]619 var entries = tocEntries(document.getElementById("content"), toclevels);
620 for (var i = 0; i < entries.length; ++i) {
621 var entry = entries[i];
622 if (entry.element.id == "")
623 entry.element.id = "_toc_" + i;
624 var a = document.createElement("a");
625 a.href = "#" + entry.element.id;
626 a.appendChild(document.createTextNode(entry.text));
627 var div = document.createElement("div");
628 div.appendChild(a);
629 div.className = "toclevel" + entry.toclevel;
630 toc.appendChild(div);
631 }
632 if (entries.length == 0)
633 toc.parentNode.removeChild(toc);
634},
635
636
637/////////////////////////////////////////////////////////////////////
638// Footnotes generator
639/////////////////////////////////////////////////////////////////////
640
641/* Based on footnote generation code from:
642 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
643 */
644
645footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]646 // Delete existing footnote entries in case we're reloading the footnodes.
647 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]648 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]649 if (!noteholder) {
650 return;
651 }
652 var entriesToRemove = [];
653 for (i = 0; i < noteholder.childNodes.length; i++) {
654 var entry = noteholder.childNodes[i];
655 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
656 entriesToRemove.push(entry);
657 }
658 for (i = 0; i < entriesToRemove.length; i++) {
659 noteholder.removeChild(entriesToRemove[i]);
660 }
661
662 // Rebuild footnote entries.
663 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]664 var spans = cont.getElementsByTagName("span");
665 var refs = {};
666 var n = 0;
667 for (i=0; i<spans.length; i++) {
668 if (spans[i].className == "footnote") {
669 n++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]670 var note = spans[i].getAttribute("data-note");
671 if (!note) {
672 // Use [\s\S] in place of . so multi-line matches work.
673 // Because JavaScript has no s (dotall) regex flag.
674 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
675 spans[i].innerHTML =
676 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
677 "' title='View footnote' class='footnote'>" + n + "</a>]";
678 spans[i].setAttribute("data-note", note);
679 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]680 noteholder.innerHTML +=
681 "<div class='footnote' id='_footnote_" + n + "'>" +
682 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
683 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]684 var id =spans[i].getAttribute("id");
685 if (id != null) refs["#"+id] = n;
686 }
687 }
688 if (n == 0)
689 noteholder.parentNode.removeChild(noteholder);
690 else {
691 // Process footnoterefs.
692 for (i=0; i<spans.length; i++) {
693 if (spans[i].className == "footnoteref") {
694 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
695 href = href.match(/#.*/)[0]; // Because IE return full URL.
696 n = refs[href];
697 spans[i].innerHTML =
698 "[<a href='#_footnote_" + n +
699 "' title='View footnote' class='footnote'>" + n + "</a>]";
700 }
701 }
702 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]703},
704
705install: function(toclevels) {
706 var timerId;
707
708 function reinstall() {
709 asciidoc.footnotes();
710 if (toclevels) {
711 asciidoc.toc(toclevels);
712 }
713 }
714
715 function reinstallAndRemoveTimer() {
716 clearInterval(timerId);
717 reinstall();
718 }
719
720 timerId = setInterval(reinstall, 500);
721 if (document.addEventListener)
722 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
723 else
724 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]725}
726
727}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]728asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]729/*]]>*/
730</script>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]731</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]732<body class="manpage">
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]733<div id="header">
734<h1>
735git-merge-file(1) Manual Page
736</h1>
737<h2>NAME</h2>
738<div class="sectionbody">
739<p>git-merge-file -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]740 Run a three-way file merge
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]741</p>
742</div>
743</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]744<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]745<div class="sect1">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]746<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]747<div class="sectionbody">
748<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]749<pre class="content"><em>git merge-file</em> [-L &lt;current-name&gt; [-L &lt;base-name&gt; [-L &lt;other-name&gt;]]]
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]750 [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=&lt;n&gt;]
Junio C Hamano0241d052013-08-30 23:52:17[diff] [blame]751 [--[no-]diff3] &lt;current-file&gt; &lt;base-file&gt; &lt;other-file&gt;</pre>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]752<div class="attribution">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]753</div></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]758<div class="sectionbody">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]759<div class="paragraph"><p><em>git merge-file</em> incorporates all changes that lead from the <code>&lt;base-file&gt;</code>
760to <code>&lt;other-file&gt;</code> into <code>&lt;current-file&gt;</code>. The result ordinarily goes into
761<code>&lt;current-file&gt;</code>. <em>git merge-file</em> is useful for combining separate changes
762to an original. Suppose <code>&lt;base-file&gt;</code> is the original, and both
763<code>&lt;current-file&gt;</code> and <code>&lt;other-file&gt;</code> are modifications of <code>&lt;base-file&gt;</code>,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]764then <em>git merge-file</em> combines both changes.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]765<div class="paragraph"><p>A conflict occurs if both <code>&lt;current-file&gt;</code> and <code>&lt;other-file&gt;</code> have changes
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]766in a common segment of lines. If a conflict is found, <em>git merge-file</em>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]767normally outputs a warning and brackets the conflict with lines containing
768&lt;&lt;&lt;&lt;&lt;&lt;&lt; and &gt;&gt;&gt;&gt;&gt;&gt;&gt; markers. A typical conflict will look like this:</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]769<div class="literalblock">
770<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]771<pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; A
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]772lines in file A
773=======
774lines in file B
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]775&gt;&gt;&gt;&gt;&gt;&gt;&gt; B</code></pre>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]776</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]777<div class="paragraph"><p>If there are conflicts, the user should edit the result and delete one of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]778the alternatives. When <code>--ours</code>, <code>--theirs</code>, or <code>--union</code> option is in effect,
779however, these conflicts are resolved favouring lines from <code>&lt;current-file&gt;</code>,
780lines from <code>&lt;other-file&gt;</code>, or lines from both respectively. The length of the
781conflict markers can be given with the <code>--marker-size</code> option.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]782<div class="paragraph"><p>The exit value of this program is negative on error, and the number of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]783conflicts otherwise. If the merge was clean, the exit value is 0.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]784<div class="paragraph"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]785implements all of RCS <em>merge</em>'s functionality which is needed by
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]786<a href="git.html">git(1)</a>.</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]787</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]788</div>
789<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]790<h2 id="_options">OPTIONS</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]791<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]792<div class="dlist"><dl>
793<dt class="hdlist1">
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]794-L &lt;label&gt;
795</dt>
796<dd>
797<p>
798 This option may be given up to three times, and
799 specifies labels to be used in place of the
800 corresponding file names in conflict reports. That is,
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]801 <code>git merge-file -L x -L y -L z a b c</code> generates output that
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]802 looks like it came from files x, y and z instead of
803 from files a, b and c.
804</p>
805</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]806<dt class="hdlist1">
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]807-p
808</dt>
809<dd>
810<p>
811 Send results to standard output instead of overwriting
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]812 <code>&lt;current-file&gt;</code>.
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]813</p>
814</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]815<dt class="hdlist1">
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]816-q
817</dt>
818<dd>
819<p>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]820 Quiet; do not warn about conflicts.
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]821</p>
822</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]823<dt class="hdlist1">
Junio C Hamano0241d052013-08-30 23:52:17[diff] [blame]824--diff3
825</dt>
826<dd>
827<p>
828 Show conflicts in "diff3" style.
829</p>
830</dd>
831<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]832--ours
833</dt>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]834<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]835--theirs
836</dt>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]837<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]838--union
839</dt>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]840<dd>
841<p>
842 Instead of leaving conflicts in the file, resolve conflicts
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]843 favouring our (or their or both) side of the lines.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]844</p>
845</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]846</dl></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[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="_examples">EXAMPLES</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]851<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]852<div class="dlist"><dl>
853<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]854<code>git merge-file README.my README README.upstream</code>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]855</dt>
856<dd>
857<p>
858 combines the changes of README.my and README.upstream since README,
859 tries to merge them and writes the result into README.my.
860</p>
861</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]862<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]863<code>git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345</code>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]864</dt>
865<dd>
866<p>
867 merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]868 <code>a</code> and <code>c</code> instead of <code>tmp/a123</code> and <code>tmp/c345</code>.
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]869</p>
870</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]871</dl></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]872</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]873</div>
874<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]875<h2 id="_git">GIT</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]876<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]877<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]878</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]879</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]880</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]881<div id="footnotes"><hr /></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]882<div id="footer">
883<div id="footer-text">
Junio C Hamano0241d052013-08-30 23:52:17[diff] [blame]884Last updated 2013-08-30 16:51:59 PDT
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]885</div>
886</div>
887</body>
888</html>