| blob | 1bf1f7a5e0258a645e35fdfea22b3e872dd4cdb1 |
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 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-merge-index(1) Manual Page
407 </h1>
410 <p>git-merge-index -
411 Run a merge for files needing merging
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div>
418 </div>
421 <div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge
425 </div>
430 --
431 </dt>
432 <dd>
433 <p>
434 Do not interpret any more arguments as options.
435 </p>
436 </dd>
438 -a
439 </dt>
440 <dd>
441 <p>
442 Run merge against all files in the index that need merging.
443 </p>
444 </dd>
446 -o
447 </dt>
448 <dd>
449 <p>
450 Instead of stopping at the first failed merge, do all of them
451 in one shot - continue with merging even when previous merges
452 returned errors, and only return the error code after all the
453 merges.
454 </p>
455 </dd>
457 -q
458 </dt>
459 <dd>
460 <p>
461 Do not complain about a failed merge program (a merge program
462 failure usually indicates conflicts during the merge). This is for
463 porcelains which might want to emit custom messages.
464 </p>
465 </dd>
466 </dl></div>
467 <div class="paragraph"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it
468 processes them in turn only stopping if merge returns a non-zero exit
469 code.</p></div>
473 distribution.</p></div>
476 original is first. But the argument order to the 3-way merge program
482 This is MM from the original tree. # original
483 This is modified MM in the branch A. # merge1
484 This is modified MM in the branch B. # merge2
485 This is modified MM in the branch B. # current contents</tt></pre>
486 </div></div>
491 cat: : No such file or directory
492 This is added AA in the branch A.
493 This is added AA in the branch B.
494 This is added AA in the branch B.
495 fatal: merge program failed</tt></pre>
496 </div></div>
497 <div class="paragraph"><p>where the latter example shows how <em>git merge-index</em> will stop trying to
499 for the AA file, because it didn’t exist in the original, and thus
501 </div>
504 <div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>
506 </div>
509 <div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
510 </div>
514 </div>
518 </div>
519 </div>
520 </body>
521 </html>