diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
| commit | 619596afe5769620cfbaca941f701a3fa106e6e5 (patch) | |
| tree | a0065a9102205adf638a7ff9e35bb50ce049dcd0 /git-diff-files.html | |
| parent | b5a296fa6d8cd1a703ce2eb6232e0bbc654bd2a2 (diff) | |
| download | git-htmldocs-619596afe5769620cfbaca941f701a3fa106e6e5.tar.gz | |
Autogenerated HTML docs for v1.7.2.1-158-gbd3a97
Diffstat (limited to 'git-diff-files.html')
| -rw-r--r-- | git-diff-files.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 529da9fee..6438773d8 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -899,7 +899,11 @@ another file.</p></div> <dd>
<p>
Ignore changes to submodules in the diff generation. <when> can be
- either "untracked", "dirty" or "all", which is the default. When
+ either "none", "untracked", "dirty" or "all", which is the default
+ 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
"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,
@@ -1527,7 +1531,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 2010-08-10 05:29:38 UTC
+Last updated 2010-08-18 22:14:49 UTC
</div>
</div>
</body>
|