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