From: Shawn Pearce Date: Mon, 25 Sep 2006 15:58:21 GMT Subject: [PATCH] Clarified documentation of --exclude-per-directory. Message-ID: <20060925155821.GC26844@spearce.org> Tommi Virtanen noted on #git today that git ls-files --exclude-per-directory doesn't appear to work as advertised by the documentation unless --others is also used. According to the current source code this is the case as the --exclude-per-directory file isn't read unless we are iterating over the working directory, which only happens with --others. Signed-off-by: Shawn O. Pearce --- Documentation/git-ls-files.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 8520b97..2a0b9f8 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -75,7 +75,8 @@ OPTIONS --exclude-per-directory=:: read additional exclude patterns that apply only to the - directory and its subdirectories in . + directory and its subdirectories in . This option + only takes effect if -o or --others is also used. --error-unmatch:: If any does not appear in the index, treat this as an @@ -167,7 +168,7 @@ time. They are built and ordered in the * lines read from --exclude-from=; patterns are ordered in the same order as they appear in the file. - * When --exclude-per-directory= is specified, upon + * When --exclude-per-directory= and --others is specified, upon entering a directory that has such a file, its contents are appended at the end of the current "list of patterns". They are popped off when leaving the directory. -- 1.4.2.1.g7a39b