Autogenerated HTML docs for v1.7.11-3-g60475

1 files changed, 22 insertions, 21 deletions

diff --git a/git-diff.html b/git-diff.html
index c6e73b347..d8442731d 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -605,7 +605,7 @@ between two files on disk.</p></div>
         the index (staging area for the next commit).  In other

         words, the differences are what you <em>could</em> tell git to

         further add to the index but you still haven&#8217;t.  You can

-        stage these changes by using .

+        stage these changes by using <a href="git-add.html">git-add(1)</a>.

 </p>

 <div class="paragraph"><p>If exactly two paths are given and at least one points outside

 the current repository, <em>git diff</em> will compare the two files /

@@ -675,11 +675,11 @@ in the last two forms that use ".." notations, can be any
 &lt;tree&gt;.  The third form (<em>git diff &lt;commit&gt; &lt;commit&gt;</em>) can also

 be used to compare two &lt;blob&gt; objects.</p></div>

 <div class="paragraph"><p>For a more complete list of ways to spell &lt;commit&gt;, see

-"SPECIFYING REVISIONS" section in .

+"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.

 However, "diff" is about comparing two <em>endpoints</em>, not ranges,

 and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and

 "&lt;commit&gt;...&lt;commit&gt;") do not mean a range as defined in the

-"SPECIFYING RANGES" section in .</p></div>

+"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div>

 </div>

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

 <div class="sectionbody">

@@ -807,7 +807,7 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
         sub-directory. The behavior of <tt>--dirstat</tt> can be customized by

         passing it a comma separated list of parameters.

         The defaults are controlled by the <tt>diff.dirstat</tt> configuration

-        variable (see ).

+        variable (see <a href="git-config.html">git-config(1)</a>).

         The following parameters are available:

 </p>

 <div class="dlist"><dl>

@@ -929,7 +929,7 @@ any of those replacements occurred.</p></div>
 <p>

         Specify how differences in submodules are shown.  When <tt>--submodule</tt>

         or <tt>--submodule=log</tt> is given, the <em>log</em> format is used.  This format lists

-        the commits in the range like  <tt>summary</tt> does.

+        the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <tt>summary</tt> does.

         Omitting the <tt>--submodule</tt> option or specifying <tt>--submodule=short</tt>,

         uses the <em>short</em> format. This format just shows the names of the commits

         at the beginning and end of the range.

@@ -1028,7 +1028,7 @@ expression to make sure that it matches all non-whitespace characters.
 A match that contains a newline is silently truncated(!) at the

 newline.</p></div>

 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see

- or .  Giving it explicitly

+<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>.  Giving it explicitly

 overrides any diff driver or configuration setting.  Diff drivers

 override configuration settings.</p></div>

 </dd>

@@ -1223,7 +1223,7 @@ of a delete/create pair.</p></div>
         Look for differences that introduce or remove an instance of

         &lt;string&gt;. Note that this is different than the string simply

         appearing in diff output; see the <em>pickaxe</em> entry in

-         for more details.

+        <a href="gitdiffcore.html">gitdiffcore(7)</a> for more details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1374,8 +1374,8 @@ of a delete/create pair.</p></div>
 <dd>

 <p>

         Allow an external diff helper to be executed. If you set an

-        external diff driver with , you need

-        to use this option with  and friends.

+        external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need

+        to use this option with <a href="git-log.html">git-log(1)</a> and friends.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1395,12 +1395,12 @@ of a delete/create pair.</p></div>
 <dd>

 <p>

         Allow (or disallow) external text conversion filters to be run

-        when comparing binary files. See  for

+        when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for

         details. Because textconv filters are typically a one-way

         conversion, the resulting diff is suitable for human

         consumption, but cannot be applied. For this reason, textconv

-        filters are enabled by default only for  and

-        , but not for  or

+        filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and

+        <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or

         diff plumbing commands.

 </p>

 </dd>

@@ -1414,7 +1414,7 @@ of a delete/create pair.</p></div>
         Using "none" will consider the submodule modified when it either contains

         untracked or modified files or its HEAD differs from the commit recorded

         in the superproject and can be used to override any settings of the

-        <em>ignore</em> option in  or . When

+        <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When

         "untracked" is used submodules are not considered dirty when they only

         contain untracked content (but they are still scanned for modified

         content). Using "dirty" ignores all changes to the work tree of submodules,

@@ -1448,7 +1448,7 @@ of a delete/create pair.</p></div>
 </dd>

 </dl></div>

 <div class="paragraph"><p>For more detailed explanation on these common options, see also

-.</p></div>

+<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 &lt;path&gt;&#8230;

@@ -1780,8 +1780,8 @@ rename to a</tt></pre>
 <div class="sectionbody">

 <div class="paragraph"><p>Any diff-generating command can take the &#8216;-c` or <tt>--cc</tt> option to

 produce a <em>combined diff</em> when showing a merge. This is the default

-format when showing merges with  or

-. Note also that you can give the `-m&#8217; option to any

+format when showing merges with <a href="git-diff.html">git-diff(1)</a> or

+<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m&#8217; option to any

 of these commands to force generation of diffs with individual parents

 of a merge.</p></div>

 <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>

@@ -2168,14 +2168,15 @@ Output diff in reverse.
 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>diff(1),

-,

-,

-,

-,</p></div>

+<a href="git-difftool.html">git-difftool(1)</a>,

+<a href="git-log.html">git-log(1)</a>,

+<a href="gitdiffcore.html">gitdiffcore(7)</a>,

+<a href="git-format-patch.html">git-format-patch(1)</a>,

+<a href="git-apply.html">git-apply(1)</a></p></div>

 </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>