summaryrefslogtreecommitdiff
path: root/Documentation/git-status.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-02 09:07:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-02 11:59:19 -0700
commit150b493ad42757b60eacbf98ff11982456481982 (patch)
treef16ece72f50f2df88085aa4671502f0b65d12bfe /Documentation/git-status.txt
parent1282988b4d3d37926050a5f21ad4f7516d9a2d7f (diff)
downloadgit-150b493ad42757b60eacbf98ff11982456481982.tar.gz
git status --ignored: tests and docs
Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-status.txt')
-rw-r--r--Documentation/git-status.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 1cab91b534..b663e51444 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -49,6 +49,9 @@ See linkgit:git-config[1] for configuration variable
used to change the default for when the option is not
specified.
+--ignored::
+ Show ignored files as well.
+
-z::
Terminate entries with NUL, instead of LF. This implies
the `--porcelain` output format if no other format is given.
@@ -80,6 +83,8 @@ shows the status of stage #3 (i.e. theirs).
For entries that do not have conflicts, `X` shows the status of the index,
and `Y` shows the status of the work tree. For untracked paths, `XY` are
`??`.
+For ignored paths, `XY` are `!!`; they are shown only when the `--ignored`
+option is in effect.
X Y Meaning
-------------------------------------------------
@@ -102,6 +107,7 @@ and `Y` shows the status of the work tree. For untracked paths, `XY` are
U U unmerged, both modified
-------------------------------------------------
? ? untracked
+ ! ! ignored
-------------------------------------------------