Merge branch 'jk/maint-1.7.2-status-ignored'
* 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
This commit is contained in:
@ -69,6 +69,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.
|
||||
@ -119,7 +122,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
|
||||
-------------------------------------------------
|
||||
@ -142,6 +146,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
|
||||
|
Reference in New Issue
Block a user