Google Git
Sign in
chromium / external / gitster / git-htmldocs / c6e5950c965e32176f152a8f5dcab23dd7086e58 / . / git-merge-index.html
blob: efd6ed38f0745e02a8f59ac099348b7c516d9f20 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-merge-index(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-merge-index(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-merge-index -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]317 Run a merge for files needing merging
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]323<div class="para"><p><em>git merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | [--] &lt;file&gt;*)</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]324</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]326<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]327<div class="para"><p>This looks up the &lt;file&gt;(s) in the index and, if there are any merge
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]328entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
329argument if no file), and &lt;file&gt; as argument 4. File modes for the three
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]330files are passed as arguments 5, 6 and 7.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]331</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]332<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]333<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]334<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]335<dt>
Junio C Hamano1bb569e2006-05-05 23:14:25[diff] [blame]336--
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]337</dt>
338<dd>
339<p>
340 Do not interpret any more arguments as options.
341</p>
342</dd>
343<dt>
344-a
345</dt>
346<dd>
347<p>
348 Run merge against all files in the index that need merging.
349</p>
350</dd>
351<dt>
352-o
353</dt>
354<dd>
355<p>
356 Instead of stopping at the first failed merge, do all of them
357 in one shot - continue with merging even when previous merges
358 returned errors, and only return the error code after all the
359 merges are over.
360</p>
361</dd>
362<dt>
363-q
364</dt>
365<dd>
366<p>
367 Do not complain about failed merge program (the merge program
368 failure usually indicates conflicts during merge). This is for
369 porcelains which might want to emit custom messages.
370</p>
371</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]372</dl></div>
373<div class="para"><p>If <em>git-merge-index</em> is called with multiple &lt;file&gt;s (or -a) then it
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]374processes them in turn only stopping if merge returns a non-zero exit
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]375code.</p></div>
376<div class="para"><p>Typically this is run with a script calling git's imitation of
377the <em>merge</em> command from the RCS package.</p></div>
378<div class="para"><p>A sample script called <em>git-merge-one-file</em> is included in the
379distribution.</p></div>
380<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the
381RCS <em>merge</em> program merge object order. In the above ordering, the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]382original is first. But the argument order to the 3-way merge program
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]383<em>merge</em> is to have the original in the middle. Don't ask me why.</p></div>
384<div class="para"><p>Examples:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]385<div class="literalblock">
386<div class="content">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]387<pre><tt>torvalds@ppc970:~/merge-test&gt; git merge-index cat MM
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]388This is MM from the original tree. # original
389This is modified MM in the branch A. # merge1
390This is modified MM in the branch B. # merge2
391This is modified MM in the branch B. # current contents</tt></pre>
392</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]393<div class="para"><p>or</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394<div class="literalblock">
395<div class="content">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]396<pre><tt>torvalds@ppc970:~/merge-test&gt; git merge-index cat AA MM
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]397cat: : No such file or directory
398This is added AA in the branch A.
399This is added AA in the branch B.
400This is added AA in the branch B.
401fatal: merge program failed</tt></pre>
402</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]403<div class="para"><p>where the latter example shows how <em>git-merge-index</em> will stop trying to
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]404merge once anything has returned an error (i.e., <tt>cat</tt> returned an error
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]405for the AA file, because it didn't exist in the original, and thus
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]406<em>git-merge-index</em> didn't even try to merge the MM thing).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]407</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]408<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]409<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]410<div class="para"><p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;
411One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]412</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]413<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]414<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]415<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]416</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]417<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]418<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]419<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]420</div>
421<div id="footer">
422<div id="footer-text">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]423Last updated 2008-07-06 05:16:53 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]424</div>
425</div>
426</body>
427</html>