Autogenerated HTML docs for v1.4.0-rc2

diff --git a/git-ls-files.html b/git-ls-files.html
index ec6f1d8..315c002 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -628,8 +628,7 @@ an optional prefix <em>!</em> which means that the fate this pattern
 <p>\r
 if it does not contain a slash <em>/</em>, it is a shell glob\r
    pattern and used to match against the filename without\r
-   leading directories (i.e. the same way as the current\r
-   implementation).\r
+   leading directories.\r
 </p>\r
 </li>\r
 <li>\r
@@ -659,6 +658,17 @@ otherwise, it is a shell glob pattern, suitable for
         --exclude-from=.git/ignore \\r
         --exclude-per-directory=.gitignore</tt></pre>\r
 </div></div>\r
+<p>Another example:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>    $ cat .gitignore\r
+    vmlinux*\r
+    $ ls arch/foo/kernel/vm*\r
+    arch/foo/kernel/vmlinux.lds.S\r
+    $ echo '!/vmlinux*' &gt;arch/foo/kernel/.gitignore</tt></pre>\r
+</div></div>\r
+<p>The second .gitignore keeps <tt>arch/foo/kernel/vmlinux.lds.S</tt> file\r
+from getting ignored.</p>\r
 </div>\r
 <h2>See Also</h2>\r
 <div class="sectionbody">\r
@@ -678,7 +688,7 @@ otherwise, it is a shell glob pattern, suitable for
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-May-2006 23:14:13 UTC\r
+Last updated 08-Jun-2006 03:41:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.txt b/git-ls-files.txt
index a29c633..4d8a2ad 100644 (file)
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -195,8 +195,7 @@ An exclude pattern is of the following format:
 
  - if it does not contain a slash '/', it is a shell glob
    pattern and used to match against the filename without
-   leading directories (i.e. the same way as the current
-   implementation).
+   leading directories.
 
  - otherwise, it is a shell glob pattern, suitable for
    consumption by fnmatch(3) with FNM_PATHNAME flag.  I.e. a
@@ -222,6 +221,19 @@ An example:
         --exclude-per-directory=.gitignore
 --------------------------------------------------------------
 
+Another example:
+
+--------------------------------------------------------------
+    $ cat .gitignore
+    vmlinux*
+    $ ls arch/foo/kernel/vm*
+    arch/foo/kernel/vmlinux.lds.S
+    $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
+--------------------------------------------------------------
+
+The second .gitignore keeps `arch/foo/kernel/vmlinux.lds.S` file
+from getting ignored.
+
 
 See Also
 --------