summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2010-09-15 19:56:48 -0400
committerJunio C Hamano <gitster@pobox.com>2010-09-15 17:30:36 -0700
commit75609a0d44d02878e6260a7a4bf2dda5310a9dd9 (patch)
tree1d690208eef28bbc0f9d03af6e0a5302f3c4faec /Documentation
parent500348aa6859e436a890f5f5a7e0eeea8ef6c1de (diff)
downloadgit-75609a0d44d02878e6260a7a4bf2dda5310a9dd9.tar.gz
git-ls-files.txt: clarify -x/--exclude option
Since b5227d8, -x/--exclude does not apply to cached files. This is easy to miss unless you read the discussion in the EXCLUDE PATTERNS section. Clarify that the option applies to untracked files and direct the reader to EXCLUDE PATTERNS. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-ls-files.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 89859153f3..c05e7a5e70 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -79,8 +79,9 @@ OPTIONS
-x <pattern>::
--exclude=<pattern>::
- Skips files matching pattern.
- Note that pattern is a shell wildcard pattern.
+ Skips untracked files matching pattern.
+ Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS
+ below for more information.
-X <file>::
--exclude-from=<file>::