diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-02 16:07:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-02 18:59:19 (GMT) |
| commit | 150b493ad42757b60eacbf98ff11982456481982 (patch) | |
| tree | f16ece72f50f2df88085aa4671502f0b65d12bfe /Documentation | |
| parent | 1282988b4d3d37926050a5f21ad4f7516d9a2d7f (diff) | |
| download | git-150b493ad42757b60eacbf98ff11982456481982.zip git-150b493ad42757b60eacbf98ff11982456481982.tar.gz git-150b493ad42757b60eacbf98ff11982456481982.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/git-status.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 1cab91b..b663e51 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 ------------------------------------------------- |