diff options
| author | Jeff King <peff@peff.net> | 2009-10-30 19:05:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 21:41:29 (GMT) |
| commit | 500348aa6859e436a890f5f5a7e0eeea8ef6c1de (patch) | |
| tree | eaf08ee1a24aa3b3ffb36bd25d047067b5517a76 /Documentation/git-ls-files.txt | |
| parent | b5227d80aee5173bfda6aa43a890d03110b0df26 (diff) | |
| download | git-500348aa6859e436a890f5f5a7e0eeea8ef6c1de.zip git-500348aa6859e436a890f5f5a7e0eeea8ef6c1de.tar.gz git-500348aa6859e436a890f5f5a7e0eeea8ef6c1de.tar.bz2 | |
ls-files: unbreak "ls-files -i"
Commit b5227d8 changed the behavior of "ls-files" with
respect to includes, but accidentally broke the "-i" option
The original behavior was:
1. if no "-i" is given, cull all results according to --exclude*
2. if "-i" is given, show the inverse of (1)
The broken behavior was:
1. if no "-i" is given:
a. for "-o", cull results according to --exclude*
b. for index files, always show all
2. if "-i" is given:
a. for "-o", shows the inverse of (1a)
b. for index files, always show all
The fixed behavior keeps the new (1b) behavior introduced
by b5227d8, but fixes the (2b) behavior to show only ignored
files, not all files.
This patch also tweaks the documentation. The original text
was somewhat obscure in the first place, but it is also now
inaccurate (the relationship between (1b) and (2b) is not
quite a "reverse").
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-ls-files.txt')
| -rw-r--r-- | Documentation/git-ls-files.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 057a021..8985915 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -48,8 +48,10 @@ OPTIONS -i:: --ignored:: - Show ignored files in the output. - Note that this also reverses any exclude list present. + Show only ignored files in the output. When showing files in the + index, print only those matched by an exclude pattern. When + showing "other" files, show only those matched by an exclude + pattern. -s:: --stage:: |