diff options
| author | Jameson Miller <jamill@microsoft.com> | 2017-10-30 13:21:39 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-31 11:54:21 +0900 |
| commit | 1b2bc3912a183c88ccd70050a359a2b6bbacca7d (patch) | |
| tree | eff303f257c8debd6849cd1f57584f0583867365 /Documentation/git-status.txt | |
| parent | 07966ed19ed6936442bdb9cf40f315369e78bd0d (diff) | |
| download | git-1b2bc3912a183c88ccd70050a359a2b6bbacca7d.tar.gz git-1b2bc3912a183c88ccd70050a359a2b6bbacca7d.tar.xz | |
status: document options to show matching ignored files
Signed-off-by: Jameson Miller <jamill@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-status.txt')
| -rw-r--r-- | Documentation/git-status.txt | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 9f3a78a36..fc282e0a9 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -97,8 +97,27 @@ configuration variable documented in linkgit:git-config[1]. (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set). ---ignored:: +--ignored[=<mode>]:: Show ignored files as well. ++ +The mode parameter is used to specify the handling of ignored files. +It is optional: it defaults to 'traditional'. ++ +The possible options are: ++ + - 'traditional' - Shows ignored files and directories, unless + --untracked-files=all is specifed, in which case + individual files in ignored directories are + displayed. + - 'no' - Show no ignored files. + - 'matching' - Shows ignored files and directories matching an + ignore pattern. ++ +When 'matching' mode is specified, paths that explicity 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. -z:: Terminate entries with NUL, instead of LF. This implies |