From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Sep 2010 21:46:44 +0000 (-0700)
Subject: Merge branch 'js/ls-files-x-doc'
X-Git-Tag: v1.7.3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1125297ca1744be09f9e392aab0dd2c70d838583;p=thirdparty%2Fgit.git

Merge branch 'js/ls-files-x-doc'

* js/ls-files-x-doc:
  ls-files documentation: reword for consistency
  git-ls-files.txt: clarify -x/--exclude option

Conflicts:
	Documentation/git-ls-files.txt
---

1125297ca1744be09f9e392aab0dd2c70d838583
diff --cc Documentation/git-ls-files.txt
index 15aee2f953,44b6480c0f..347f447986
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@@ -192,8 -178,8 +193,8 @@@ These exclude patterns come from these 
       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=<name> specifies
+   3. The command line flag --exclude-per-directory=<name> specifies
 -     a name of the file in each directory 'git-ls-files'
 +     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
       same order they appear in the files.