summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
commit719b8a3137af7aea177e42a98cdfbb5180a10f33 (patch)
tree0b0aceeacfdab20db87a431a8a95e1388f0d9e19 /git-diff-files.html
parent022bd341a82a08e16719ab8744973feed49e94d3 (diff)
downloadgit-htmldocs-719b8a3137af7aea177e42a98cdfbb5180a10f33.tar.gz
Autogenerated HTML docs for v1.7.11-rc2-2-g02101
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html28
1 files changed, 14 insertions, 14 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 8d1577678..488f0400d 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -720,7 +720,7 @@ same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div>
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 <a href="git-config.html">git-config(1)</a>).
+ variable (see ).
The following parameters are available:
</p>
<div class="dlist"><dl>
@@ -842,7 +842,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 <a href="git-submodule.html">git-submodule(1)</a> <tt>summary</tt> does.
+ the commits in the range like <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.
@@ -938,7 +938,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
-<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
+ or . Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers
override configuration settings.</p></div>
</dd>
@@ -1133,7 +1133,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
- <a href="gitdiffcore.html">gitdiffcore(7)</a> for more details.
+ for more details.
</p>
</dd>
<dt class="hdlist1">
@@ -1284,8 +1284,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 <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.
+ external diff driver with , you need
+ to use this option with and friends.
</p>
</dd>
<dt class="hdlist1">
@@ -1305,12 +1305,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 <a href="gitattributes.html">gitattributes(5)</a> for
+ when comparing binary files. See 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 <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
+ filters are enabled by default only for and
+ , but not for or
diff plumbing commands.
</p>
</dd>
@@ -1324,7 +1324,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 <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
+ <em>ignore</em> option in or . 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,
@@ -1358,7 +1358,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
-<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
+.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-1 --base
@@ -1724,8 +1724,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 <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
+format when showing merges with or
+. 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>
@@ -1963,7 +1963,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>