| blob | 54d439ab7ea23c5694bc1be19c86df0d8f4a77da |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-merge-index(1) Manual Page
574 </h1>
577 <p>git-merge-index -
578 Run a merge for files needing merging
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</div>
588 </div></div>
589 </div>
592 <div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge
596 </div>
601 --
602 </dt>
603 <dd>
604 <p>
605 Do not interpret any more arguments as options.
606 </p>
607 </dd>
609 -a
610 </dt>
611 <dd>
612 <p>
613 Run merge against all files in the index that need merging.
614 </p>
615 </dd>
617 -o
618 </dt>
619 <dd>
620 <p>
621 Instead of stopping at the first failed merge, do all of them
622 in one shot - continue with merging even when previous merges
623 returned errors, and only return the error code after all the
624 merges.
625 </p>
626 </dd>
628 -q
629 </dt>
630 <dd>
631 <p>
632 Do not complain about a failed merge program (a merge program
633 failure usually indicates conflicts during the merge). This is for
634 porcelains which might want to emit custom messages.
635 </p>
636 </dd>
637 </dl></div>
638 <div class="paragraph"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it
639 processes them in turn only stopping if merge returns a non-zero exit
640 code.</p></div>
644 distribution.</p></div>
647 original is first. But the argument order to the 3-way merge program
653 This is MM from the original tree. # original
654 This is modified MM in the branch A. # merge1
655 This is modified MM in the branch B. # merge2
656 This is modified MM in the branch B. # current contents</tt></pre>
657 </div></div>
662 cat: : No such file or directory
663 This is added AA in the branch A.
664 This is added AA in the branch B.
665 This is added AA in the branch B.
666 fatal: merge program failed</tt></pre>
667 </div></div>
668 <div class="paragraph"><p>where the latter example shows how <em>git merge-index</em> will stop trying to
670 for the AA file, because it didn’t exist in the original, and thus
672 </div>
676 </div>
677 </div>
682 </div>
683 </div>
684 </body>
685 </html>