diff options
author | Junio C Hamano <junio@kernel.org> | 2010-07-01 00:08:51 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-07-01 00:08:51 +0000 |
commit | 7d44952cc831fe14797546fa07afc857b0844d25 (patch) | |
tree | 30d2c8dfe0d9897379c3a3f472b4f21ab4822c81 /git-diff.html | |
parent | 30e8106caeb8158599478faa5ec02eb955db38fa (diff) | |
download | git-htmldocs-7d44952cc831fe14797546fa07afc857b0844d25.tar.gz |
Autogenerated HTML docs for v1.7.2-rc1
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-diff.html b/git-diff.html index cff2bf2bb..53ec59f59 100644 --- a/git-diff.html +++ b/git-diff.html @@ -951,11 +951,17 @@ override configuration settings.</p></div> </p>
</dd>
<dt>
---ignore-submodules
+--ignore-submodules[=<when>]
</dt>
<dd>
<p>
- Ignore changes to submodules in the diff generation.
+ Ignore changes to submodules in the diff generation. <when> can be
+ either "untracked", "dirty" or "all", which is the default. 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,
+ only changes to the commits stored in the superproject are shown (this was
+ the behavior until 1.7.0). Using "all" hides all changes to submodules.
</p>
</dd>
<dt>
@@ -1705,7 +1711,7 @@ Output diff in reverse. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-06-13 19:56:34 UTC
+Last updated 2010-07-01 00:08:19 UTC
</div>
</div>
</body>
|