Google Git
Sign in
chromium / external / gitster / git-htmldocs / ec87f52676ecc7be43d1d7740a679a42b3192a01 / . / git-mergetool.html
blob: 7bbcd0be742d00b6e7f444a5e55ad116b873fbe9 [file] [log] [blame]
Junio C Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[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 Hamano103ad7f2007-03-14 11:19:26[diff] [blame]306</style>
307<title>git-mergetool(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-mergetool(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-mergetool -
317 Run merge conflict resolution tools to resolve merge conflicts
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 mergetool</em> [--tool=&lt;tool&gt;] [&lt;file&gt;]&#8230;</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]324</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]326<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]327<div class="para"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve
328merge conflicts. It is typically run after <em>git-merge</em>.</p></div>
329<div class="para"><p>If one or more &lt;file&gt; parameters are given, the merge tool program will
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]330be run to resolve differences on each file. If no &lt;file&gt; names are
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]331specified, <em>git-mergetool</em> will run the merge tool program on every file
332with merge conflicts.</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]333</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]334<h2 id="_options">OPTIONS</h2>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]335<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]336<div class="vlist"><dl>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]337<dt>
338-t or --tool=&lt;tool&gt;
339</dt>
340<dd>
341<p>
342 Use the merge resolution program specified by &lt;tool&gt;.
343 Valid merge tools are:
Junio C Hamano1c708832007-11-02 02:47:50[diff] [blame]344 kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]345</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em>
Junio C Hamanobb343172008-03-09 10:39:09[diff] [blame]347will use the configuration variable <tt>merge.tool</tt>. If the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]348configuration variable <tt>merge.tool</tt> is not set, <em>git-mergetool</em>
349will pick a suitable default.</p></div>
350<div class="para"><p>You can explicitly provide a full path to the tool by setting the
Junio C Hamanobb343172008-03-09 10:39:09[diff] [blame]351configuration variable <tt>mergetool.&lt;tool&gt;.path</tt>. For example, you
Junio C Hamano1c708832007-11-02 02:47:50[diff] [blame]352can configure the absolute path to kdiff3 by setting
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]353<tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git-mergetool</em> assumes the
354tool is available in PATH.</p></div>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame^]355<div class="para"><p>Instead of running one of the known merge tool programs,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]356<em>git-mergetool</em> can be customized to run an alternative program
Junio C Hamanocb1c44f2008-08-06 06:19:33[diff] [blame]357by specifying the command line to invoke in a configuration
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]358variable <tt>mergetool.&lt;tool&gt;.cmd</tt>.</p></div>
359<div class="para"><p>When <em>git-mergetool</em> is invoked with this tool (either through the
Junio C Hamanobb343172008-03-09 10:39:09[diff] [blame]360<tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration
361variable) the configured command line will be invoked with <tt>$BASE</tt>
362set to the name of a temporary file containing the common base for
363the merge, if available; <tt>$LOCAL</tt> set to the name of a temporary
364file containing the contents of the file on the current branch;
365<tt>$REMOTE</tt> set to the name of a temporary file containing the
366contents of the file to be merged, and <tt>$MERGED</tt> set to the name
367of the file to which the merge tool should write the result of the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]368merge resolution.</p></div>
369<div class="para"><p>If the custom merge tool correctly indicates the success of a
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame^]370merge resolution with its exit code, then the configuration
Junio C Hamanobb343172008-03-09 10:39:09[diff] [blame]371variable <tt>mergetool.&lt;tool&gt;.trustExitCode</tt> can be set to <tt>true</tt>.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]372Otherwise, <em>git-mergetool</em> will prompt the user to indicate the
373success of the resolution after the custom tool has exited.</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]374</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]375</dl></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]376</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]377<h2 id="_author">Author</h2>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]378<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]379<div class="para"><p>Written by Theodore Y Ts'o &lt;tytso@mit.edu&gt;</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]380</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]381<h2 id="_documentation">Documentation</h2>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]382<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]383<div class="para"><p>Documentation by Theodore Y Ts'o.</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]384</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]385<h2 id="_git">GIT</h2>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]386<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]387<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]388</div>
389<div id="footer">
390<div id="footer-text">
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame^]391Last updated 2008-12-10 08:33:20 UTC
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]392</div>
393</div>
394</body>
395</html>