Google Git
Sign in
chromium / external / gitster / git-htmldocs / 3fd7b26af6b6bde4db248b51413472b66937e01c / . / git-merge-file.html
blob: fc795881cbffb7df0db742ae8b05d21e599f5f30 [file] [log] [blame]
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[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 Hamano1de7bc62006-12-17 19:31:54[diff] [blame]306</style>
307<title>git-merge-file(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-merge-file(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-merge-file -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]317 Run a three-way file merge
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
323<div class="verseblock">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]324<div class="content"><em>git merge-file</em> [-L &lt;current-name&gt; [-L &lt;base-name&gt; [-L &lt;other-name&gt;]]]
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]325 [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=&lt;n&gt;]
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]326 &lt;current-file&gt; &lt;base-file&gt; &lt;other-file&gt;</div></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]327</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]328<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]329<div class="sectionbody">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]330<div class="para"><p><em>git merge-file</em> incorporates all changes that lead from the <tt>&lt;base-file&gt;</tt>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]331to <tt>&lt;other-file&gt;</tt> into <tt>&lt;current-file&gt;</tt>. The result ordinarily goes into
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]332<tt>&lt;current-file&gt;</tt>. <em>git merge-file</em> is useful for combining separate changes
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]333to an original. Suppose <tt>&lt;base-file&gt;</tt> is the original, and both
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]334<tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> are modifications of <tt>&lt;base-file&gt;</tt>,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]335then <em>git merge-file</em> combines both changes.</p></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]336<div class="para"><p>A conflict occurs if both <tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> have changes
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]337in a common segment of lines. If a conflict is found, <em>git merge-file</em>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]338normally outputs a warning and brackets the conflict with lines containing
339&lt;&lt;&lt;&lt;&lt;&lt;&lt; and &gt;&gt;&gt;&gt;&gt;&gt;&gt; markers. A typical conflict will look like this:</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]340<div class="literalblock">
341<div class="content">
342<pre><tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt; A
343lines in file A
344=======
345lines in file B
346&gt;&gt;&gt;&gt;&gt;&gt;&gt; B</tt></pre>
347</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]348<div class="para"><p>If there are conflicts, the user should edit the result and delete one of
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]349the alternatives. When <tt>--ours</tt>, <tt>--theirs</tt>, or <tt>--union</tt> option is in effect,
350however, these conflicts are resolved favouring lines from <tt>&lt;current-file&gt;</tt>,
351lines from <tt>&lt;other-file&gt;</tt>, or lines from both respectively. The length of the
352conflict markers can be given with the <tt>--marker-size</tt> option.</p></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]353<div class="para"><p>The exit value of this program is negative on error, and the number of
354conflicts otherwise. If the merge was clean, the exit value is 0.</p></div>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]355<div class="para"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]356implements all of RCS <em>merge</em>'s functionality which is needed by
357<a href="git.html">git(1)</a>.</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]358</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]359<h2 id="_options">OPTIONS</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]360<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]361<div class="vlist"><dl>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]362<dt>
363-L &lt;label&gt;
364</dt>
365<dd>
366<p>
367 This option may be given up to three times, and
368 specifies labels to be used in place of the
369 corresponding file names in conflict reports. That is,
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]370 <tt>git merge-file -L x -L y -L z a b c</tt> generates output that
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]371 looks like it came from files x, y and z instead of
372 from files a, b and c.
373</p>
374</dd>
375<dt>
376-p
377</dt>
378<dd>
379<p>
380 Send results to standard output instead of overwriting
381 <tt>&lt;current-file&gt;</tt>.
382</p>
383</dd>
384<dt>
385-q
386</dt>
387<dd>
388<p>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]389 Quiet; do not warn about conflicts.
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]390</p>
391</dd>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]392<dt>
393--ours
394</dt>
395<dt>
396--theirs
397</dt>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]398<dt>
399--union
400</dt>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]401<dd>
402<p>
403 Instead of leaving conflicts in the file, resolve conflicts
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]404 favouring our (or their or both) side of the lines.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]405</p>
406</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]407</dl></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]408</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]409<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]410<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]411<div class="vlist"><dl>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]412<dt>
413git merge-file README.my README README.upstream
414</dt>
415<dd>
416<p>
417 combines the changes of README.my and README.upstream since README,
418 tries to merge them and writes the result into README.my.
419</p>
420</dd>
421<dt>
422git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
423</dt>
424<dd>
425<p>
426 merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
427 <tt>a</tt> and <tt>c</tt> instead of <tt>tmp/a123</tt> and <tt>tmp/c345</tt>.
428</p>
429</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]430</dl></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]431</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432<h2 id="_author">Author</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]433<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]434<div class="para"><p>Written by Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]435</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]436<h2 id="_documentation">Documentation</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]437<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]438<div class="para"><p>Documentation by Johannes Schindelin and the git-list &lt;git@vger.kernel.org&gt;,
439with parts copied from the original documentation of RCS <em>merge</em>.</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]440</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]441<h2 id="_git">GIT</h2>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]442<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]443<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]444</div>
445<div id="footer">
446<div id="footer-text">
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]447Last updated 2010-09-03 21:30:23 UTC
Junio C Hamano1de7bc62006-12-17 19:31:54[diff] [blame]448</div>
449</div>
450</body>
451</html>