summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-12 17:54:09 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-12 17:54:09 -0700
commitcd451662c9139640c5676982f6c88f89e16c23b2 (patch)
treeb1ae28586fe8ebd5064cc527f52d24b7cf5116cc /git-diff-files.html
parente37049f6c527b79d663ec816d053581d3cae9131 (diff)
downloadgit-htmldocs-cd451662c9139640c5676982f6c88f89e16c23b2.tar.gz
Autogenerated HTML docs for v2.10.0-129-g35f6
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html25
1 files changed, 18 insertions, 7 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 317338076..d47af6469 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1087,13 +1087,16 @@ any of those replacements occurred.</p></div>
</dt>
<dd>
<p>
- Specify how differences in submodules are shown. When <code>--submodule</code>
- or <code>--submodule=log</code> 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> <code>summary</code> does.
- Omitting the <code>--submodule</code> option or specifying <code>--submodule=short</code>,
- uses the <em>short</em> format. This format just shows the names of the commits
- at the beginning and end of the range. Can be tweaked via the
- <code>diff.submodule</code> configuration variable.
+ Specify how differences in submodules are shown. When specifying
+ <code>--submodule=short</code> the <em>short</em> format is used. This format just
+ shows the names of the commits at the beginning and end of the range.
+ When <code>--submodule</code> or <code>--submodule=log</code> is specified, 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> <code>summary</code> does. When <code>--submodule=diff</code>
+ is specified, the <em>diff</em> format is used. This format shows an
+ inline diff of the changes in the submodule contents between the
+ commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format
+ if the config option is unset.
</p>
</dd>
<dt class="hdlist1">
@@ -1658,6 +1661,14 @@ information.</p></div>
Do not show any source or destination prefix.
</p>
</dd>
+<dt class="hdlist1">
+--line-prefix=&lt;prefix&gt;
+</dt>
+<dd>
+<p>
+ Prepend an additional prefix to every line of output.
+</p>
+</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>