diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 17:21:31 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 17:21:32 -0500 |
| commit | 35f263545ce853cd3e250a67cdb3c77534343239 (patch) | |
| tree | c25d6ab04f8af259aa940e73c5004693aadddbc5 | |
| parent | 5b228f956a8f7ec5127adf9e9368220d7e5d9a5e (diff) | |
| parent | 219cbf091a3d2e2e0a9bb82ba7c297eb5da413a3 (diff) | |
| download | git-35f263545ce853cd3e250a67cdb3c77534343239.tar.gz | |
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
| -rw-r--r-- | Documentation/git-check-ignore.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 59531abba4..e94367a5ed 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -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, |