[PATCH] Clarified documentation of --exclude-per-directory.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <spearce@xxxxxxxxxxx>
---
 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=<file>::
 	read additional exclude patterns that apply only to the
-	directory and its subdirectories in <file>.
+	directory and its subdirectories in <file>.  This option
+	only takes effect if -o or --others is also used.
 
 --error-unmatch::
 	If any <file> 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=<file>; patterns are ordered
    in the same order as they appear in the file.
 
- * When --exclude-per-directory=<name> is specified, upon
+ * When --exclude-per-directory=<name> 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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]