summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 14:57:08 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-15 14:57:08 +0900
commitb72f60303287a25c0a0305120b203276faca07fa (patch)
tree266b78e12ffe9ea48891de6b57c53660ecd00482 /git-status.html
parent3a9c034734bf5aa3e3b139e72a6b0b96ddf0b3e9 (diff)
downloadgit-htmldocs-b72f60303287a25c0a0305120b203276faca07fa.tar.gz
Autogenerated HTML docs for v2.15.0-276-g89ea79
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html33
1 files changed, 31 insertions, 2 deletions
diff --git a/git-status.html b/git-status.html
index 31206510f..f24528937 100644
--- a/git-status.html
+++ b/git-status.html
@@ -899,12 +899,41 @@ configuration variable documented in <a href="git-config.html">git-config(1)</a>
</p>
</dd>
<dt class="hdlist1">
---ignored
+--ignored[=&lt;mode&gt;]
</dt>
<dd>
<p>
Show ignored files as well.
</p>
+<div class="paragraph"><p>The mode parameter is used to specify the handling of ignored files.
+It is optional: it defaults to <em>traditional</em>.</p></div>
+<div class="paragraph"><p>The possible options are:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>traditional</em> - Shows ignored files and directories, unless
+ --untracked-files=all is specifed, in which case
+ individual files in ignored directories are
+ displayed.
+</p>
+</li>
+<li>
+<p>
+<em>no</em> - Show no ignored files.
+</p>
+</li>
+<li>
+<p>
+<em>matching</em> - Shows ignored files and directories matching an
+ ignore pattern.
+</p>
+<div class="paragraph"><p>When <em>matching</em> mode is specified, paths that explicity match an
+ignored pattern are shown. If a directory matches an ignore pattern,
+then it is shown, but not paths contained in the ignored directory. If
+a directory does not match an ignore pattern, but all contents are
+ignored, then the directory is not shown, but all contents are shown.</p></div>
+</li>
+</ul></div>
</dd>
<dt class="hdlist1">
-z
@@ -1241,7 +1270,7 @@ output but does not honor these settings.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-10-03 16:10:36 JST
+Last updated 2017-11-15 14:56:49 JST
</div>
</div>
</body>