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">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.4.5" />
7 <title>git-merge-index(
1)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 git-merge-index(
1) Manual Page
409 <div class=
"sectionbody">
411 Run a merge for files needing merging
415 <h2 id=
"_synopsis">SYNOPSIS
</h2>
416 <div class=
"sectionbody">
417 <div class=
"verseblock">
418 <div class=
"verseblock-content"><em>git merge-index
</em> [-o] [-q]
<merge-program
> (-a | [--]
<file
>*)
</div>
419 <div class=
"verseblock-attribution">
422 <h2 id=
"_description">DESCRIPTION
</h2>
423 <div class=
"sectionbody">
424 <div class=
"paragraph"><p>This looks up the
<file
>(s) in the index and, if there are any merge
425 entries, passes the SHA1 hash for those files as arguments
1,
2,
3 (empty
426 argument if no file), and
<file
> as argument
4. File modes for the three
427 files are passed as arguments
5,
6 and
7.
</p></div>
429 <h2 id=
"_options">OPTIONS
</h2>
430 <div class=
"sectionbody">
431 <div class=
"dlist"><dl>
437 Do not interpret any more arguments as options.
445 Run merge against all files in the index that need merging.
453 Instead of stopping at the first failed merge, do all of them
454 in one shot - continue with merging even when previous merges
455 returned errors, and only return the error code after all the
464 Do not complain about a failed merge program (a merge program
465 failure usually indicates conflicts during the merge). This is for
466 porcelains which might want to emit custom messages.
470 <div class=
"paragraph"><p>If
<em>git merge-index
</em> is called with multiple
<file
>s (or -a) then it
471 processes them in turn only stopping if merge returns a non-zero exit
473 <div class=
"paragraph"><p>Typically this is run with a script calling git
’s imitation of
474 the
<em>merge
</em> command from the RCS package.
</p></div>
475 <div class=
"paragraph"><p>A sample script called
<em>git merge-one-file
</em> is included in the
476 distribution.
</p></div>
477 <div class=
"paragraph"><p>ALERT ALERT ALERT! The git
"merge object order" is different from the
478 RCS
<em>merge
</em> program merge object order. In the above ordering, the
479 original is first. But the argument order to the
3-way merge program
480 <em>merge
</em> is to have the original in the middle. Don
’t ask me why.
</p></div>
481 <div class=
"paragraph"><p>Examples:
</p></div>
482 <div class=
"literalblock">
483 <div class=
"content">
484 <pre><tt>torvalds@ppc970:~/merge-test
> git merge-index cat MM
485 This is MM from the original tree. # original
486 This is modified MM in the branch A. # merge1
487 This is modified MM in the branch B. # merge2
488 This is modified MM in the branch B. # current contents
</tt></pre>
490 <div class=
"paragraph"><p>or
</p></div>
491 <div class=
"literalblock">
492 <div class=
"content">
493 <pre><tt>torvalds@ppc970:~/merge-test
> git merge-index cat AA MM
494 cat: : No such file or directory
495 This is added AA in the branch A.
496 This is added AA in the branch B.
497 This is added AA in the branch B.
498 fatal: merge program failed
</tt></pre>
500 <div class=
"paragraph"><p>where the latter example shows how
<em>git merge-index
</em> will stop trying to
501 merge once anything has returned an error (i.e.,
<tt>cat
</tt> returned an error
502 for the AA file, because it didn
’t exist in the original, and thus
503 <em>git merge-index
</em> didn
’t even try to merge the MM thing).
</p></div>
505 <h2 id=
"_git">GIT
</h2>
506 <div class=
"sectionbody">
507 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
510 <div id=
"footer-text">
511 Last updated
2011-
07-
23 00:
49:
30 UTC