diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:51:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:51:10 -0700 |
| commit | 3fc44a10f62fdca29558dc553a3e12949af30637 (patch) | |
| tree | 988ded72a36c0e6eaf2d6cd109423f92e09fd6a1 /Documentation | |
| parent | 30962fb7fba9a8e57fe34a70bc8abd2e0af8b2ee (diff) | |
| parent | 150b493ad42757b60eacbf98ff11982456481982 (diff) | |
| download | git-3fc44a10f62fdca29558dc553a3e12949af30637.tar.gz | |
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
* jk/maint-1.7.2-status-ignored:
git status --ignored: tests and docs
status: fix bug with missing --ignore files
Conflicts:
Documentation/git-status.txt
t/t7508-status.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-status.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 4fca13d134..3d51717bbe 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 |