From: Junio C Hamano Date: Thu, 16 Sep 2010 00:41:52 GMT Subject: Re: [PATCH] git-ls-files.txt: clarify -x/--exclude option Message-ID: <7v1v8u5xkf.fsf@alter.siamese.dyndns.org> In-Reply-To: <1284595008-36464-1-git-send-email-jaysoffian@gmail.com> Jay Soffian writes: > diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt > index 15aee2f..f52b06a 100644 > --- a/Documentation/git-ls-files.txt > +++ b/Documentation/git-ls-files.txt > @@ -79,8 +79,9 @@ OPTIONS > > -x :: > --exclude=:: > - 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. Would be helpful; will queue directly on top of 500348a. Thanks By the way, I think the language in that file needs a bit of tweaking for readability. Perhaps this on top of your patch... -- >8 -- Subject: [PATCH] ls-files documentation: reword for consistency Similar to descriptions of other options, state what -x does in imperative mood. Start sentences for -X and --exclude-per-directory options in capital letters. Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index c05e7a5..44b6480 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -79,16 +79,16 @@ OPTIONS -x :: --exclude=:: - Skips untracked files matching pattern. + Skip untracked files matching pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information. -X :: --exclude-from=:: - exclude patterns are read from ; 1 per line. + Read exclude patterns from ; 1 per line. --exclude-per-directory=:: - read additional exclude patterns that apply only to the + Read additional exclude patterns that apply only to the directory and its subdirectories in . --exclude-standard:: @@ -178,7 +178,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= specifies + 3. The command line flag --exclude-per-directory= 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 -- 1.7.3.rc2.221.gbf93f