diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-18 14:46:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-18 14:46:44 -0700 |
| commit | 1125297ca1744be09f9e392aab0dd2c70d838583 (patch) | |
| tree | ac3bb72ed41bf015cebb23a9d9ee010b803b8ec8 | |
| parent | git-rebase--interactive.sh: replace cut with ${v%% *} (diff) | |
| parent | ls-files documentation: reword for consistency (diff) | |
| download | tgif-1125297ca1744be09f9e392aab0dd2c70d838583.tar.xz | |
Merge branch 'js/ls-files-x-doc'
* js/ls-files-x-doc:
ls-files documentation: reword for consistency
git-ls-files.txt: clarify -x/--exclude option
Conflicts:
Documentation/git-ls-files.txt
| -rw-r--r-- | Documentation/git-ls-files.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 15aee2f953..347f447986 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -79,15 +79,16 @@ OPTIONS -x <pattern>:: --exclude=<pattern>:: - Skips files matching pattern. - Note that pattern is a shell wildcard pattern. + Skip untracked files matching pattern. + Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS + below for more information. -X <file>:: --exclude-from=<file>:: - exclude patterns are read from <file>; 1 per line. + Read exclude patterns from <file>; 1 per line. --exclude-per-directory=<file>:: - read additional exclude patterns that apply only to the + Read additional exclude patterns that apply only to the directory and its subdirectories in <file>. --exclude-standard:: @@ -192,7 +193,7 @@ These exclude patterns come from these places, in order: file containing a list of patterns. Patterns are ordered in the same order they appear in the file. - 3. command line flag --exclude-per-directory=<name> specifies + 3. The command line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the |