From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 8 Jun 2006 03:41:35 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.0-rc2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=125c327795d6f6cf337c5ddc3aa1fa632eb6874f;p=git.git

Autogenerated HTML docs for v1.4.0-rc2
---

diff --git a/git-ls-files.html b/git-ls-files.html
index ec6f1d8c..315c0024 100644
--- 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>
 if it does not contain a slash <em>/</em>, 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.
 </p>
 </li>
 <li>
@@ -659,6 +658,17 @@ otherwise, it is a shell glob pattern, suitable for
         --exclude-from=.git/ignore \
         --exclude-per-directory=.gitignore</tt></pre>
 </div></div>
+<p>Another example:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>    $ cat .gitignore
+    vmlinux*
+    $ ls arch/foo/kernel/vm*
+    arch/foo/kernel/vmlinux.lds.S
+    $ echo '!/vmlinux*' &gt;arch/foo/kernel/.gitignore</tt></pre>
+</div></div>
+<p>The second .gitignore keeps <tt>arch/foo/kernel/vmlinux.lds.S</tt> file
+from getting ignored.</p>
 </div>
 <h2>See Also</h2>
 <div class="sectionbody">
@@ -678,7 +688,7 @@ otherwise, it is a shell glob pattern, suitable for
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-May-2006 23:14:13 UTC
+Last updated 08-Jun-2006 03:41:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt
index a29c633c..4d8a2ad2 100644
--- 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
 --------