summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-21 00:08:23 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-21 00:08:23 -0700
commita28a920b817789e9535e30d163d1cfeda9803b99 (patch)
tree0276dc9699fe17f0b3daa7ad772b8f34f11463b7 /git-diff-tree.html
parent010705ace148110d091fef2fb78d70223306d9e0 (diff)
downloadgit-htmldocs-a28a920b817789e9535e30d163d1cfeda9803b99.tar.gz
Autogenerated HTML docs for v1.7.11-3-g60475
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html52
1 files changed, 26 insertions, 26 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index e421c6e46..e0b66592e 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -722,7 +722,7 @@ git-diff-tree(1) Manual Page
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>
@@ -844,7 +844,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.
@@ -940,7 +940,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>
@@ -1135,7 +1135,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">
@@ -1286,8 +1286,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">
@@ -1307,12 +1307,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>
@@ -1326,7 +1326,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,
@@ -1360,7 +1360,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;tree-ish&gt;
@@ -1475,7 +1475,7 @@ commits (but not trees).</p></div>
format. When omitted, the format defaults to <em>medium</em>.
</p>
<div class="paragraph"><p>Note: you can specify the default pretty format in the repository
-configuration (see ).</p></div>
+configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
</dd>
<dt class="hdlist1">
--abbrev-commit
@@ -1526,7 +1526,7 @@ people using 80-column terminals.</p></div>
</dt>
<dd>
<p>
- Show the notes (see ) that annotate the
+ Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given
@@ -1534,7 +1534,7 @@ people using 80-column terminals.</p></div>
</p>
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
<em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
-environment overrides). See for more details.</p></div>
+environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
<div class="paragraph"><p>With an optional <em>&lt;ref&gt;</em> argument, show this notes ref instead of the
default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
is not qualified.</p></div>
@@ -1632,7 +1632,7 @@ file.</p></div>
additional formats by setting a pretty.&lt;name&gt;
config option to either another format name, or a
<em>format:</em> string, as described below (see
-). Here are the details of the
+<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p></div>
<div class="ulist"><ul>
<li>
@@ -1799,7 +1799,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%aN</em>: author name (respecting .mailmap, see or )
+<em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -1809,7 +1809,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%aE</em>: author email (respecting .mailmap, see or )
+<em>%aE</em>: author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -1844,7 +1844,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%cN</em>: committer name (respecting .mailmap, see or )
+<em>%cN</em>: committer name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -1854,7 +1854,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%cE</em>: committer email (respecting .mailmap, see or )
+<em>%cE</em>: committer email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -1884,7 +1884,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%d</em>: ref names, like the --decorate option of
+<em>%d</em>: ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
</p>
</li>
<li>
@@ -1934,7 +1934,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%gN</em>: reflog identity name (respecting .mailmap, see or )
+<em>%gN</em>: reflog identity name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -1944,7 +1944,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%gE</em>: reflog identity email (respecting .mailmap, see or )
+<em>%gE</em>: reflog identity email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
@@ -2000,7 +2000,7 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
<li>
<p>
<em>%w([&lt;w&gt;[,&lt;i1&gt;[,&lt;i2&gt;]]])</em>: switch line wrapping, like the -w option of
- .
+ <a href="git-shortlog.html">git-shortlog(1)</a>.
</p>
</li>
</ul></div>
@@ -2422,8 +2422,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>
@@ -2661,7 +2661,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 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>