X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-status.txt;h=3d51717bbe84d0201b1c7a38943b2e99643bd89f;hb=a536a9db08a1f5ac327940a25e42d30a54730105;hp=4fca13d13408c2c82318fba2dd8a3468053c97c8;hpb=c43a1bede3319ee95c21e753ed53d907041f5cee;p=git.git diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 4fca13d13..3d51717bb 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -70,6 +70,9 @@ configuration variable documented in linkgit:git-config[1]. (and suppresses the output of submodule summaries when the config option `status.submodulesummary` is set). +--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. @@ -120,7 +123,8 @@ codes can be interpreted as follows: * 'C' = copied * 'U' = updated but unmerged -Ignored files are not listed. +Ignored files are not listed, unless `--ignored` option is in effect, +in which case `XY` are `!!`. X Y Meaning ------------------------------------------------- @@ -143,6 +147,7 @@ Ignored files are not listed. U U unmerged, both modified ------------------------------------------------- ? ? untracked + ! ! ignored ------------------------------------------------- If -b is used the short-format status is preceded by a line