1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-merge-index(1)</title>
\r
264 git-merge-index(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-merge-index -
\r
269 Runs a merge for files needing merging
\r
274 <div class="sectionbody">
\r
275 <p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | — | <file>*)</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>This looks up the <file>(s) in the index and, if there are any merge
\r
280 entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
\r
281 argument if no file), and <file> as argument 4. File modes for the three
\r
282 files are passed as arguments 5, 6 and 7.</p>
\r
285 <div class="sectionbody">
\r
292 Do not interpret any more arguments as options.
\r
300 Run merge against all files in the index that need merging.
\r
308 Instead of stopping at the first failed merge, do all of them
\r
309 in one shot - continue with merging even when previous merges
\r
310 returned errors, and only return the error code after all the
\r
319 Do not complain about failed merge program (the merge program
\r
320 failure usually indicates conflicts during merge). This is for
\r
321 porcelains which might want to emit custom messages.
\r
325 <p>If "git-merge-index" is called with multiple <file>s (or -a) then it
\r
326 processes them in turn only stopping if merge returns a non-zero exit
\r
328 <p>Typically this is run with the a script calling the merge command from
\r
329 the RCS package.</p>
\r
330 <p>A sample script called "git-merge-one-file" is included in the
\r
332 <p>ALERT ALERT ALERT! The git "merge object order" is different from the
\r
333 RCS "merge" program merge object order. In the above ordering, the
\r
334 original is first. But the argument order to the 3-way merge program
\r
335 "merge" is to have the original in the middle. Don't ask me why.</p>
\r
337 <div class="literalblock">
\r
338 <div class="content">
\r
339 <pre><tt>torvalds@ppc970:~/merge-test> git-merge-index cat MM
\r
340 This is MM from the original tree. # original
\r
341 This is modified MM in the branch A. # merge1
\r
342 This is modified MM in the branch B. # merge2
\r
343 This is modified MM in the branch B. # current contents</tt></pre>
\r
346 <div class="literalblock">
\r
347 <div class="content">
\r
348 <pre><tt>torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
\r
349 cat: : No such file or directory
\r
350 This is added AA in the branch A.
\r
351 This is added AA in the branch B.
\r
352 This is added AA in the branch B.
\r
353 fatal: merge program failed</tt></pre>
\r
355 <p>where the latter example shows how "git-merge-index" will stop trying to
\r
356 merge once anything has returned an error (ie "cat" returned an error
\r
357 for the AA file, because it didn't exist in the original, and thus
\r
358 "git-merge-index" didn't even try to merge the MM thing).</p>
\r
361 <div class="sectionbody">
\r
362 <p>Written by Linus Torvalds <torvalds@osdl.org>
\r
363 One-shot merge by Petr Baudis <pasky@ucw.cz></p>
\r
365 <h2>Documentation</h2>
\r
366 <div class="sectionbody">
\r
367 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
370 <div class="sectionbody">
\r
371 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
374 <div id="footer-text">
\r
375 Last updated 27-Dec-2005 00:16:20 PDT
\r