diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-21 00:08:23 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-21 00:08:23 -0700 |
commit | a28a920b817789e9535e30d163d1cfeda9803b99 (patch) | |
tree | 0276dc9699fe17f0b3daa7ad772b8f34f11463b7 /git-difftool.html | |
parent | 010705ace148110d091fef2fb78d70223306d9e0 (diff) | |
download | git-htmldocs-a28a920b817789e9535e30d163d1cfeda9803b99.tar.gz |
Autogenerated HTML docs for v1.7.11-3-g60475
Diffstat (limited to 'git-difftool.html')
-rw-r--r-- | git-difftool.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-difftool.html b/git-difftool.html index b28875623..cb393244a 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -592,7 +592,7 @@ git-difftool(1) Manual Page <div class="paragraph"><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. See
-.</p></div>
+<a href="git-diff.html">git-diff(1)</a>.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -702,7 +702,7 @@ with custom merge tool commands and has the same value as <tt>$MERGED</tt>.</p>< </p>
</dd>
</dl></div>
-<div class="paragraph"><p>See for the full list of supported options.</p></div>
+<div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
</div>
<h2 id="_config_variables">CONFIG VARIABLES</h2>
<div class="sectionbody">
@@ -757,6 +757,7 @@ difftool.prompt <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
+<a href="git-diff.html">git-diff(1)</a>
</dt>
<dd>
<p>
@@ -764,6 +765,7 @@ difftool.prompt </p>
</dd>
<dt class="hdlist1">
+<a href="git-mergetool.html">git-mergetool(1)</a>
</dt>
<dd>
<p>
@@ -771,6 +773,7 @@ difftool.prompt </p>
</dd>
<dt class="hdlist1">
+<a href="git-config.html">git-config(1)</a>
</dt>
<dd>
<p>
@@ -781,7 +784,7 @@ difftool.prompt </div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>
|