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.2.5" />
7 <style type=
"text/css">
9 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
11 border: 1px solid red;
16 margin: 1em 5% 1em 5%;
21 text-decoration: underline
;
39 h1
, h2
, h3
, h4
, h5
, h6
{
41 font-family: sans-serif
;
48 border-bottom: 2px solid silver
;
66 border: 1px solid silver
;
81 font-family: sans-serif
;
88 font-family: sans-serif
;
92 font-family: sans-serif
;
94 border-top: 2px solid silver
;
100 padding-bottom: 0.5em;
104 padding-bottom: 0.5em;
108 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
109 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
110 div
.admonitionblock
{
113 margin-bottom: 1.5em;
115 div
.admonitionblock
{
117 margin-bottom: 2.5em;
120 div
.content
{ /* Block element content. */
124 /* Block element titles. */
125 div
.title
, caption
.title
{
126 font-family: sans-serif
;
130 margin-bottom: 0.5em;
136 td div
.title:first-child
{
139 div
.content div
.title:first-child
{
142 div
.content
+ div
.title
{
146 div
.sidebarblock
> div
.content
{
148 border: 1px solid silver
;
155 div
.listingblock
> div
.content
{
156 border: 1px solid silver
;
161 div
.quoteblock
> div
.content
{
168 div
.verseblock
+ div
.attribution
{
172 div
.admonitionblock
.icon
{
176 text-decoration: underline
;
178 padding-right: 0.5em;
180 div
.admonitionblock td
.content
{
182 border-left: 2px solid silver
;
185 div
.exampleblock
> div
.content
{
186 border-left: 2px solid silver
;
190 div
.verseblock div
.content
{
194 div
.imageblock div
.content
{ padding-left: 0; }
195 div
.imageblock img
{ border: 1px solid silver
; }
196 span
.image img
{ border-style: none
; }
200 margin-bottom: 0.8em;
212 list-style-position: outside
;
215 list-style-type: lower-alpha
;
218 div
.tableblock
> table
{
219 border: 3px solid
#527bbd;
222 font-family: sans-serif
;
231 margin-bottom: 0.8em;
239 padding-right: 0.8em;
246 div#footer-badges
{ display: none
; }
251 font-family: sans-serif
;
255 margin-bottom: 0.1em;
258 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
274 include1::./stylesheets
/xhtml11-manpage
.css
[]
275 /* Workarounds for IE6's broken and incomplete CSS2. */
277 div
.sidebar-content
{
279 border: 1px solid silver
;
282 div
.sidebar-title
, div
.image-title
{
283 font-family: sans-serif
;
286 margin-bottom: 0.5em;
289 div
.listingblock div
.content
{
290 border: 1px solid silver
;
295 div
.quoteblock-content
{
299 div
.exampleblock-content
{
300 border-left: 2px solid silver
;
304 /* IE6 sets dynamically generated links as visited. */
305 div#toc
a:visited
{ color: blue
; }
307 <title>git-mergetool(
1)
</title>
312 git-mergetool(
1) Manual Page
315 <div class=
"sectionbody">
317 Run merge conflict resolution tools to resolve merge conflicts
322 <div class=
"sectionbody">
323 <div class=
"para"><p><em>git mergetool
</em> [--tool=
<tool
>] [-y|--no-prompt|--prompt] [
<file
>]
…</p></div>
325 <h2 id=
"_description">DESCRIPTION
</h2>
326 <div class=
"sectionbody">
327 <div class=
"para"><p>Use
<tt>git mergetool
</tt> to run one of several merge utilities to resolve
328 merge conflicts. It is typically run after
<em>git-merge
</em>.
</p></div>
329 <div class=
"para"><p>If one or more
<file
> parameters are given, the merge tool program will
330 be run to resolve differences on each file. If no
<file
> names are
331 specified,
<em>git-mergetool
</em> will run the merge tool program on every file
332 with merge conflicts.
</p></div>
334 <h2 id=
"_options">OPTIONS
</h2>
335 <div class=
"sectionbody">
336 <div class=
"vlist"><dl>
345 Use the merge resolution program specified by
<tool
>.
346 Valid merge tools are:
347 kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
348 diffuse, tortoisemerge, opendiff, p4merge and araxis.
350 <div class=
"para"><p>If a merge resolution program is not specified,
<em>git-mergetool
</em>
351 will use the configuration variable
<tt>merge.tool
</tt>. If the
352 configuration variable
<tt>merge.tool
</tt> is not set,
<em>git-mergetool
</em>
353 will pick a suitable default.
</p></div>
354 <div class=
"para"><p>You can explicitly provide a full path to the tool by setting the
355 configuration variable
<tt>mergetool.
<tool
>.path
</tt>. For example, you
356 can configure the absolute path to kdiff3 by setting
357 <tt>mergetool.kdiff3.path
</tt>. Otherwise,
<em>git-mergetool
</em> assumes the
358 tool is available in PATH.
</p></div>
359 <div class=
"para"><p>Instead of running one of the known merge tool programs,
360 <em>git-mergetool
</em> can be customized to run an alternative program
361 by specifying the command line to invoke in a configuration
362 variable
<tt>mergetool.
<tool
>.cmd
</tt>.
</p></div>
363 <div class=
"para"><p>When
<em>git-mergetool
</em> is invoked with this tool (either through the
364 <tt>-t
</tt> or
<tt>--tool
</tt> option or the
<tt>merge.tool
</tt> configuration
365 variable) the configured command line will be invoked with
<tt>$BASE
</tt>
366 set to the name of a temporary file containing the common base for
367 the merge, if available;
<tt>$LOCAL
</tt> set to the name of a temporary
368 file containing the contents of the file on the current branch;
369 <tt>$REMOTE
</tt> set to the name of a temporary file containing the
370 contents of the file to be merged, and
<tt>$MERGED
</tt> set to the name
371 of the file to which the merge tool should write the result of the
372 merge resolution.
</p></div>
373 <div class=
"para"><p>If the custom merge tool correctly indicates the success of a
374 merge resolution with its exit code, then the configuration
375 variable
<tt>mergetool.
<tool
>.trustExitCode
</tt> can be set to
<tt>true
</tt>.
376 Otherwise,
<em>git-mergetool
</em> will prompt the user to indicate the
377 success of the resolution after the custom tool has exited.
</p></div>
387 Don't prompt before each invocation of the merge resolution
396 Prompt before each invocation of the merge resolution program.
397 This is the default behaviour; the option is provided to
398 override any configuration settings.
403 <h2 id=
"_author">Author
</h2>
404 <div class=
"sectionbody">
405 <div class=
"para"><p>Written by Theodore Y Ts'o
<tytso@mit.edu
></p></div>
407 <h2 id=
"_documentation">Documentation
</h2>
408 <div class=
"sectionbody">
409 <div class=
"para"><p>Documentation by Theodore Y Ts'o.
</p></div>
411 <h2 id=
"_git">GIT
</h2>
412 <div class=
"sectionbody">
413 <div class=
"para"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
416 <div id=
"footer-text">
417 Last updated
2009-
12-
03 09:
12:
41 UTC