Merge branch 'dk/check-ignore-docs' into maint

Documentation clarification for "check-ignore" without "--verbose".

* dk/check-ignore-docs:
  check-ignore: correct documentation about output
This commit is contained in:
Jeff King 2015-12-01 17:21:31 -05:00
commit 35f263545c

View File

@ -16,10 +16,9 @@ DESCRIPTION
-----------
For each pathname given via the command-line or from a file via
`--stdin`, show the pattern from .gitignore (or other input files to
the exclude mechanism) that decides if the pathname is excluded or
included. Later patterns within a file take precedence over earlier
ones.
`--stdin`, check whether the file is excluded by .gitignore (or other
input files to the exclude mechanism) and output the path if it is
excluded.
By default, tracked files are not shown at all since they are not
subject to exclude rules; but see `--no-index'.
@ -32,7 +31,8 @@ OPTIONS
-v, --verbose::
Also output details about the matching pattern (if any)
for each given pathname.
for each given pathname. For precedence rules within and
between exclude sources, see linkgit:gitignore[5].
--stdin::
Read pathnames from the standard input, one per line,