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-difftool(
1)
</title>
312 git-difftool(
1) Manual Page
315 <div class=
"sectionbody">
317 Show changes using common diff tools
322 <div class=
"sectionbody">
323 <div class=
"para"><p><em>git difftool
</em> [--tool=
<tool
>] [-y|--no-prompt|--prompt] [
<<em>git diff
</em> options
>]
</p></div>
325 <h2 id=
"_description">DESCRIPTION
</h2>
326 <div class=
"sectionbody">
327 <div class=
"para"><p><em>git-difftool
</em> is a git command that allows you to compare and edit files
328 between revisions using common diff tools.
<em>git difftool
</em> is a frontend
329 to
<em>git-diff
</em> and accepts the same options and arguments.
</p></div>
331 <h2 id=
"_options">OPTIONS
</h2>
332 <div class=
"sectionbody">
333 <div class=
"vlist"><dl>
342 Do not prompt before launching a diff tool.
350 Prompt before each invocation of the diff tool.
351 This is the default behaviour; the option is provided to
352 override any configuration settings.
363 Use the diff tool specified by
<tool
>.
364 Valid merge tools are:
365 kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
366 ecmerge, diffuse and opendiff
368 <div class=
"para"><p>If a diff tool is not specified,
<em>git-difftool
</em>
369 will use the configuration variable
<tt>diff.tool
</tt>. If the
370 configuration variable
<tt>diff.tool
</tt> is not set,
<em>git-difftool
</em>
371 will pick a suitable default.
</p></div>
372 <div class=
"para"><p>You can explicitly provide a full path to the tool by setting the
373 configuration variable
<tt>difftool.
<tool
>.path
</tt>. For example, you
374 can configure the absolute path to kdiff3 by setting
375 <tt>difftool.kdiff3.path
</tt>. Otherwise,
<em>git-difftool
</em> assumes the
376 tool is available in PATH.
</p></div>
377 <div class=
"para"><p>Instead of running one of the known diff tools,
378 <em>git-difftool
</em> can be customized to run an alternative program
379 by specifying the command line to invoke in a configuration
380 variable
<tt>difftool.
<tool
>.cmd
</tt>.
</p></div>
381 <div class=
"para"><p>When
<em>git-difftool
</em> is invoked with this tool (either through the
382 <tt>-t
</tt> or
<tt>--tool
</tt> option or the
<tt>diff.tool
</tt> configuration variable)
383 the configured command line will be invoked with the following
384 variables available:
<tt>$LOCAL
</tt> is set to the name of the temporary
385 file containing the contents of the diff pre-image and
<tt>$REMOTE
</tt>
386 is set to the name of the temporary file containing the contents
387 of the diff post-image.
<tt>$BASE
</tt> is provided for compatibility
388 with custom merge tool commands and has the same value as
<tt>$LOCAL
</tt>.
</p></div>
391 <div class=
"para"><p>See
<a href=
"git-diff.html">git-diff(
1)
</a> for the full list of supported options.
</p></div>
393 <h2 id=
"_config_variables">CONFIG VARIABLES
</h2>
394 <div class=
"sectionbody">
395 <div class=
"para"><p><em>git-difftool
</em> falls back to
<em>git-mergetool
</em> config variables when the
396 difftool equivalents have not been defined.
</p></div>
397 <div class=
"vlist"><dl>
403 The default diff tool to use.
407 difftool.
<tool
>.path
411 Override the path for the given tool. This is useful in case
412 your tool is not in the PATH.
416 difftool.
<tool
>.cmd
420 Specify the command to invoke the specified diff tool.
422 <div class=
"para"><p>See the
<tt>--tool=
<tool
></tt> option above for more details.
</p></div>
429 Prompt before each invocation of the diff tool.
434 <h2 id=
"_see_also">SEE ALSO
</h2>
435 <div class=
"sectionbody">
436 <div class=
"vlist"><dl>
438 <a href=
"git-diff.html">git-diff(
1)
</a>
442 Show changes between commits, commit and working tree, etc
446 <a href=
"git-mergetool.html">git-mergetool(
1)
</a>
450 Run merge conflict resolution tools to resolve merge conflicts
454 <a href=
"git-config.html">git-config(
1)
</a>
458 Get and set repository or global options
463 <h2 id=
"_author">AUTHOR
</h2>
464 <div class=
"sectionbody">
465 <div class=
"para"><p>Written by David Aguilar
<davvid@gmail.com
>.
</p></div>
467 <h2 id=
"_documentation">Documentation
</h2>
468 <div class=
"sectionbody">
469 <div class=
"para"><p>Documentation by David Aguilar and the git-list
<git@vger.kernel.org
>.
</p></div>
471 <h2 id=
"_git">GIT
</h2>
472 <div class=
"sectionbody">
473 <div class=
"para"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
476 <div id=
"footer-text">
477 Last updated
2009-
04-
18 06:
17:
31 UTC