Autogenerated HTML docs for v1.6.6.1-383-g5a9f

1 files changed, 9 insertions, 9 deletions

diff --git a/git-difftool.html b/git-difftool.html
index e8cf5bc53..d8b331242 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -324,9 +324,9 @@ git-difftool(1) Manual Page
 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="para"><p><em>git-difftool</em> is a git command that allows you to compare and edit files

+<div class="para"><p><em>git difftool</em> is a git command that allows you to compare and edit files

 between revisions using common diff tools.  <em>git difftool</em> is a frontend

-to <em>git-diff</em> and accepts the same options and arguments.</p></div>

+to <em>git diff</em> and accepts the same options and arguments.</p></div>

 </div>

 <h2 id="_options">OPTIONS</h2>

 <div class="sectionbody">

@@ -365,20 +365,20 @@ to <em>git-diff</em> and accepts the same options and arguments.</p></div>
         kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,

         ecmerge, diffuse, opendiff, p4merge and araxis.

 </p>

-<div class="para"><p>If a diff tool is not specified, <em>git-difftool</em>

+<div class="para"><p>If a diff tool is not specified, <em>git difftool</em>

 will use the configuration variable <tt>diff.tool</tt>.  If the

-configuration variable <tt>diff.tool</tt> is not set, <em>git-difftool</em>

+configuration variable <tt>diff.tool</tt> is not set, <em>git difftool</em>

 will pick a suitable default.</p></div>

 <div class="para"><p>You can explicitly provide a full path to the tool by setting the

 configuration variable <tt>difftool.&lt;tool&gt;.path</tt>. For example, you

 can configure the absolute path to kdiff3 by setting

-<tt>difftool.kdiff3.path</tt>. Otherwise, <em>git-difftool</em> assumes the

+<tt>difftool.kdiff3.path</tt>. Otherwise, <em>git difftool</em> assumes the

 tool is available in PATH.</p></div>

 <div class="para"><p>Instead of running one of the known diff tools,

-<em>git-difftool</em> can be customized to run an alternative program

+<em>git difftool</em> can be customized to run an alternative program

 by specifying the command line to invoke in a configuration

 variable <tt>difftool.&lt;tool&gt;.cmd</tt>.</p></div>

-<div class="para"><p>When <em>git-difftool</em> is invoked with this tool (either through the

+<div class="para"><p>When <em>git difftool</em> is invoked with this tool (either through the

 <tt>-t</tt> or <tt>--tool</tt> option or the <tt>diff.tool</tt> configuration variable)

 the configured command line will be invoked with the following

 variables available: <tt>$LOCAL</tt> is set to the name of the temporary

@@ -418,7 +418,7 @@ with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></
 </div>

 <h2 id="_config_variables">CONFIG VARIABLES</h2>

 <div class="sectionbody">

-<div class="para"><p><em>git-difftool</em> falls back to <em>git-mergetool</em> config variables when the

+<div class="para"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the

 difftool equivalents have not been defined.</p></div>

 <div class="vlist"><dl>

 <dt>

@@ -508,7 +508,7 @@ difftool.prompt
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-01-21 00:41:36 UTC

+Last updated 2010-01-21 17:44:26 UTC

 </div>

 </div>

 </body>