Autogenerated HTML docs for v1.4.0-rc2-g5e3a6

[git.git] / git-ls-files.html

diff --git a/git-ls-files.html b/git-ls-files.html
index ed81380..315c002 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -280,7 +280,7 @@ git-ls-files(1) Manual Page
                 [-X <file>|--exclude-from=<file>]\r
                 [--exclude-per-directory=<file>]\r
                 [--error-unmatch]\r
-                [--full-name] [--] [&lt;file&gt;]*</div></div>\r
+                [--full-name] [--abbrev] [--] [&lt;file&gt;]*</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -352,6 +352,14 @@ shown:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--no-empty-directory\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not list empty directories. Has no effect without --directory.\r
+</p>\r
+</dd>\r
+<dt>\r
 -u|--unmerged\r
 </dt>\r
 <dd>\r
@@ -492,7 +500,17 @@ other
 </p>\r
 </dd>\r
 <dt>\r
-&#8212;\r
+--abbrev[=&lt;n&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal object\r
+        lines, show only handful hexdigits prefix.\r
+        Non default number of digits can be specified with --abbrev=&lt;n&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
+--\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -610,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
@@ -641,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
@@ -660,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 22-Feb-2006 10:44:46 UTC\r
+Last updated 08-Jun-2006 03:41:12 UTC\r
 </div>\r
 </div>\r
 </body>\r