summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-06-30 01:19:32 +0000
committerJunio C Hamano <junio@kernel.org>2011-06-30 01:19:32 +0000
commit4c4b012f8e2199a3fa817a0d95bbde69a0fb1c4b (patch)
tree54a9e036f635309f4ef6c04b4587d57bf52f6a75 /git-status.html
parent7444c60ec3a9c128aff5addce42d2c012d7a9098 (diff)
downloadgit-htmldocs-4c4b012f8e2199a3fa817a0d95bbde69a0fb1c4b.tar.gz
Autogenerated HTML docs for v1.7.6-49-g033c2
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html14
1 files changed, 12 insertions, 2 deletions
diff --git a/git-status.html b/git-status.html
index 86dbe5e60..ee920b3df 100644
--- a/git-status.html
+++ b/git-status.html
@@ -517,6 +517,14 @@ configuration variable documented in <a href="git-config.html">git-config(1)</a>
</p>
</dd>
<dt class="hdlist1">
+--ignored
+</dt>
+<dd>
+<p>
+ Show ignored files as well.
+</p>
+</dd>
+<dt class="hdlist1">
-z
</dt>
<dd>
@@ -595,7 +603,8 @@ codes can be interpreted as follows:</p></div>
</p>
</li>
</ul></div>
-<div class="paragraph"><p>Ignored files are not listed.</p></div>
+<div class="paragraph"><p>Ignored files are not listed, unless <tt>--ignored</tt> option is in effect,
+in which case <tt>XY</tt> are <tt>!!</tt>.</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>X Y Meaning
@@ -619,6 +628,7 @@ A A unmerged, both added
U U unmerged, both modified
-------------------------------------------------
? ? untracked
+! ! ignored
-------------------------------------------------</tt></pre>
</div></div>
<div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div>
@@ -677,7 +687,7 @@ shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-05-31 19:53:01 UTC
+Last updated 2011-06-30 01:18:40 UTC
</div>
</div>
</body>