summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-09 14:55:30 +0900
committerJunio C Hamano <gitster@pobox.com>2019-10-09 14:55:30 +0900
commit48cd3f1251acf31e83d2e59ddf2176aa8e84290c (patch)
tree56769f5f3a65e8ce06b8eaa6f1b8bb795c8c6434 /git-status.html
parenta8858316fb3186e69d324183d9af58ef55dfb794 (diff)
downloadgit-htmldocs-48cd3f1251acf31e83d2e59ddf2176aa8e84290c.tar.gz
Autogenerated HTML docs for v2.23.0-526-g70bf0
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html16
1 files changed, 11 insertions, 5 deletions
diff --git a/git-status.html b/git-status.html
index 7e82b586e..57caa7f79 100644
--- a/git-status.html
+++ b/git-status.html
@@ -846,6 +846,8 @@ This is optional and defaults to the original version <em>v1</em> format.</p></d
<p>
Show untracked files.
</p>
+<div class="openblock">
+<div class="content">
<div class="paragraph"><p>The mode parameter is used to specify the handling of untracked files.
It is optional: it defaults to <em>all</em>, and if specified, it must be
stuck to the option (e.g. <code>-uno</code>, but not <code>-u no</code>).</p></div>
@@ -865,6 +867,8 @@ stuck to the option (e.g. <code>-uno</code>, but not <code>-u no</code>).</p></d
<p>
<em>all</em> - Also shows individual files in untracked directories.
</p>
+</li>
+</ul></div>
<div class="paragraph"><p>When <code>-u</code> option is not used, untracked files and directories are
shown (i.e. the same as specifying <code>normal</code>), to help you avoid
forgetting to add newly created files. Because it takes extra work
@@ -876,8 +880,7 @@ Consider enabling untracked cache and split index if supported (see
return more quickly without showing untracked files.</p></div>
<div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles
configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div>
-</li>
-</ul></div>
+</div></div>
</dd>
<dt class="hdlist1">
--ignore-submodules[=&lt;when&gt;]
@@ -906,6 +909,8 @@ configuration variable documented in <a href="git-config.html">git-config(1)</a>
<p>
Show ignored files as well.
</p>
+<div class="openblock">
+<div class="content">
<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>
@@ -928,13 +933,14 @@ It is optional: it defaults to <em>traditional</em>.</p></div>
<em>matching</em> - Shows ignored files and directories matching an
ignore pattern.
</p>
+</li>
+</ul></div>
<div class="paragraph"><p>When <em>matching</em> mode is specified, paths that explicitly 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>
+</div></div>
</dd>
<dt class="hdlist1">
-z
@@ -1331,7 +1337,7 @@ using <code>git --no-optional-locks status</code> (see <a href="git.html">git(1)
<div id="footer">
<div id="footer-text">
Last updated
- 2019-04-22 12:35:42 JST
+ 2019-10-09 14:51:03 JST
</div>
</div>
</body>