summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-10-31 04:03:55 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-10-31 04:03:55 +0000
commitc21ab059d7d4dcad19afc93fc1499e8a9b97fd7a (patch)
treee089d48d0f6440fa50436a1e9ad275bd4556332e /git-diff-files.html
parent621e123b886211db461d69906b1e7c184c37263e (diff)
downloadgit-htmldocs-c21ab059d7d4dcad19afc93fc1499e8a9b97fd7a.tar.gz
Autogenerated HTML docs for v1.6.5.2-140-g5f809
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 78c464453..fed7cf04e 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -480,6 +480,18 @@ same as for <em>git-diff-index</em> and <em>git-diff-tree</em>.</p></div>
</p>
</dd>
<dt>
+--submodule[=&lt;format&gt;]
+</dt>
+<dd>
+<p>
+ Chose the output format for submodule differences. &lt;format&gt; can be one of
+ <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
+ is used when this option is not given. <em>log</em> is the default value for this
+ option and lists the commits in that commit range like the <em>summary</em>
+ option of <a href="git-submodule.html">git-submodule(1)</a> does.
+</p>
+</dd>
+<dt>
--color
</dt>
<dd>
@@ -1120,7 +1132,7 @@ It is preceded with a "git diff" header, that looks like
</div></div>
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
+<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.</p></div>
@@ -1413,7 +1425,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-29 08:35:00 UTC
+Last updated 2009-10-31 04:03:03 UTC
</div>
</div>
</body>