From 679d22d20cf456c6384e077487dea82d623b8441 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Sat, 2 Jun 2007 21:13:44 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.2-167-g4bc70

---
 config.txt                      |  12 +-
 core-tutorial.html              |   2 +-
 cvs-migration.html              |   2 +-
 diffcore.html                   |   2 +-
 everyday.html                   |   2 +-
 git-add.html                    |   2 +-
 git-am.html                     |   6 +-
 git-am.txt                      |   1 -
 git-annotate.html               |   2 +-
 git-apply.html                  |   2 +-
 git-applymbox.html              |   2 +-
 git-applypatch.html             |   2 +-
 git-archimport.html             |   2 +-
 git-archive.html                |   2 +-
 git-bisect.html                 |   2 +-
 git-blame.html                  |   2 +-
 git-branch.html                 |   2 +-
 git-bundle.html                 |   2 +-
 git-cat-file.html               |   2 +-
 git-check-attr.html             |   2 +-
 git-check-ref-format.html       |   2 +-
 git-checkout-index.html         |   2 +-
 git-checkout.html               |   2 +-
 git-cherry-pick.html            |   2 +-
 git-cherry.html                 |   2 +-
 git-clean.html                  |   2 +-
 git-clone.html                  |   2 +-
 git-commit-tree.html            |   2 +-
 git-commit.html                 |   2 +-
 git-config.html                 |  24 +-
 git-convert-objects.html        |   2 +-
 git-count-objects.html          |   2 +-
 git-cvsexportcommit.html        |   2 +-
 git-cvsimport.html              |   2 +-
 git-cvsserver.html              |   2 +-
 git-daemon.html                 |   2 +-
 git-describe.html               |   2 +-
 git-diff-files.html             |   2 +-
 git-diff-index.html             |   2 +-
 git-diff-tree.html              |   2 +-
 git-diff.html                   |   2 +-
 git-fast-import.html            |   2 +-
 git-fetch-pack.html             |   2 +-
 git-fetch.html                  |   2 +-
 git-fmt-merge-msg.html          |   2 +-
 git-for-each-ref.html           |   2 +-
 git-format-patch.html           |   2 +-
 git-fsck-objects.html           |   2 +-
 git-fsck.html                   |   2 +-
 git-gc.html                     |   8 +-
 git-gc.txt                      |   6 +-
 git-get-tar-commit-id.html      |   2 +-
 git-grep.html                   |   2 +-
 git-hash-object.html            |   2 +-
 git-http-fetch.html             |   2 +-
 git-http-push.html              |   2 +-
 git-imap-send.html              |   2 +-
 git-index-pack.html             |   2 +-
 git-init-db.html                |   2 +-
 git-init.html                   |   2 +-
 git-instaweb.html               |   2 +-
 git-local-fetch.html            |   2 +-
 git-log.html                    |   2 +-
 git-lost-found.html             |   2 +-
 git-ls-files.html               | 115 ++-------
 git-ls-files.txt                |  99 ++------
 git-ls-remote.html              |   2 +-
 git-ls-tree.html                |   2 +-
 git-mailinfo.html               |   2 +-
 git-mailsplit.html              |   2 +-
 git-merge-base.html             |   2 +-
 git-merge-file.html             |   2 +-
 git-merge-index.html            |   2 +-
 git-merge-one-file.html         |   2 +-
 git-merge-tree.html             |   2 +-
 git-merge.html                  |   2 +-
 git-mergetool.html              |   2 +-
 git-mktag.html                  |   2 +-
 git-mktree.html                 |   2 +-
 git-mv.html                     |   2 +-
 git-name-rev.html               |   2 +-
 git-p4import.html               |   2 +-
 git-pack-objects.html           |   2 +-
 git-pack-redundant.html         |   2 +-
 git-pack-refs.html              |   2 +-
 git-parse-remote.html           |   2 +-
 git-patch-id.html               |   2 +-
 git-peek-remote.html            |   2 +-
 git-prune-packed.html           |   2 +-
 git-prune.html                  |   2 +-
 git-pull.html                   |   2 +-
 git-push.html                   |   2 +-
 git-quiltimport.html            |   2 +-
 git-read-tree.html              |   5 +-
 git-read-tree.txt               |   3 +-
 git-rebase.html                 |   2 +-
 git-receive-pack.html           |   2 +-
 git-reflog.html                 |   2 +-
 git-relink.html                 |   2 +-
 git-remote.html                 |   2 +-
 git-repack.html                 |   2 +-
 git-repo-config.html            |   2 +-
 git-request-pull.html           |   2 +-
 git-rerere.html                 |   2 +-
 git-reset.html                  |   2 +-
 git-rev-list.html               |   2 +-
 git-rev-parse.html              |   2 +-
 git-revert.html                 |   2 +-
 git-rm.html                     |   2 +-
 git-runstatus.html              |   2 +-
 git-send-email.html             |   2 +-
 git-send-pack.html              |   2 +-
 git-sh-setup.html               |   2 +-
 git-shell.html                  |   2 +-
 git-shortlog.html               |   2 +-
 git-show-branch.html            |   2 +-
 git-show-index.html             |   2 +-
 git-show-ref.html               |   2 +-
 git-show.html                   |   2 +-
 git-ssh-fetch.html              |   2 +-
 git-ssh-upload.html             |   2 +-
 git-status.html                 |  10 +-
 git-status.txt                  |   8 +-
 git-stripspace.html             |   2 +-
 git-svn.html                    |   2 +-
 git-svnimport.html              |   2 +-
 git-symbolic-ref.html           |   2 +-
 git-tag.html                    |   2 +-
 git-tar-tree.html               |   2 +-
 git-tools.html                  |   2 +-
 git-unpack-file.html            |   2 +-
 git-unpack-objects.html         |   2 +-
 git-update-index.html           |   2 +-
 git-update-ref.html             |   2 +-
 git-update-server-info.html     |   2 +-
 git-upload-archive.html         |   2 +-
 git-upload-pack.html            |   2 +-
 git-var.html                    |   2 +-
 git-verify-pack.html            |   2 +-
 git-verify-tag.html             |   2 +-
 git-whatchanged.html            |   2 +-
 git-write-tree.html             |   2 +-
 git.html                        |   2 +-
 gitattributes.html              |   2 +-
 gitignore.html                  | 410 ++++++++++++++++++++++++++++++++
 gitignore.txt                   | 116 +++++++++
 gitk.html                       |   2 +-
 glossary.html                   |   2 +-
 hooks.html                      |   2 +-
 howto-index.html                |   2 +-
 howto/revert-branch-rebase.html |   2 +-
 repository-layout.html          |   5 +-
 repository-layout.txt           |   3 +-
 tutorial-2.html                 |   2 +-
 tutorial.html                   |   2 +-
 user-manual.html                |  12 +-
 user-manual.txt                 |  12 +-
 157 files changed, 765 insertions(+), 368 deletions(-)
 create mode 100644 gitignore.html
 create mode 100644 gitignore.txt

diff --git a/config.txt b/config.txt
index 3d8f03dfe..5868d587a 100644
--- a/config.txt
+++ b/config.txt
@@ -259,7 +259,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
 core.excludeFile::
 	In addition to '.gitignore' (per-directory) and
 	'.git/info/exclude', git looks into this file for patterns
-	of files which are not meant to be tracked.
+	of files which are not meant to be tracked.  See
+	gitlink:gitignore[5].
 
 alias.*::
 	Command aliases for the gitlink:git[1] command wrapper - e.g.
@@ -567,6 +568,15 @@ pack.compression::
 	slowest.  If not set,  defaults to core.compression.  If that is
 	not set,  defaults to -1.
 
+pack.deltaCacheSize::
+	The maxium memory in bytes used for caching deltas in
+	gitlink:git-pack-objects[1].
+	A value of 0 means no limit. Defaults to 0.
+
+pack.deltaCacheLimit::
+	The maxium size of a delta, that is cached in
+	gitlink:git-pack-objects[1]. Defaults to 1000.
+
 pull.octopus::
 	The default merge strategy to use when pulling multiple branches
 	at once.
diff --git a/core-tutorial.html b/core-tutorial.html
index 7daeca47a..0735fb2f4 100644
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -1968,7 +1968,7 @@ to follow, not easier.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 26-Apr-2007 07:19:27 UTC
+Last updated 02-Jun-2007 21:10:20 UTC
 </div>
 </div>
 </body>
diff --git a/cvs-migration.html b/cvs-migration.html
index ec563638e..58b27d367 100644
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -416,7 +416,7 @@ repositories without the need for a central maintainer.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:42 UTC
+Last updated 02-Jun-2007 21:10:20 UTC
 </div>
 </div>
 </body>
diff --git a/diffcore.html b/diffcore.html
index c48f702d3..d88be97f4 100644
--- a/diffcore.html
+++ b/diffcore.html
@@ -541,7 +541,7 @@ t</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:43 UTC
+Last updated 02-Jun-2007 21:10:21 UTC
 </div>
 </div>
 </body>
diff --git a/everyday.html b/everyday.html
index 1648f0989..e8e468334 100644
--- a/everyday.html
+++ b/everyday.html
@@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:46 UTC
+Last updated 02-Jun-2007 21:10:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.html b/git-add.html
index 7b7725d1d..183f2b112 100644
--- a/git-add.html
+++ b/git-add.html
@@ -555,7 +555,7 @@ diff
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-May-2007 15:54:21 UTC
+Last updated 02-Jun-2007 21:09:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-am.html b/git-am.html
index 1d643e28c..c96c821ef 100644
--- a/git-am.html
+++ b/git-am.html
@@ -276,8 +276,8 @@ git-am(1) Manual Page
 <div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--keep] [--utf8 | --no-utf8]
          [--3way] [--interactive] [--binary]
          [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]
-         &lt;mbox&gt;|&lt;Maildir&gt;&#8230;</div></div>
-<p><em>git-am</em> [--skip | --resolved]</p>
+         &lt;mbox&gt;|&lt;Maildir&gt;&#8230;
+<em>git-am</em> [--skip | --resolved]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -510,7 +510,7 @@ names.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-May-2007 05:01:02 UTC
+Last updated 02-Jun-2007 21:09:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-am.txt b/git-am.txt
index 25cf84a0c..f78e5dc28 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -13,7 +13,6 @@ SYNOPSIS
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]
          <mbox>|<Maildir>...
-
 'git-am' [--skip | --resolved]
 
 DESCRIPTION
diff --git a/git-annotate.html b/git-annotate.html
index 3043a7474..57f5a83b0 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -460,7 +460,7 @@ commit.</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Apr-2007 08:21:39 UTC
+Last updated 02-Jun-2007 21:09:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-apply.html b/git-apply.html
index 703476871..a8ee071ba 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -584,7 +584,7 @@ apply.whitespace
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Apr-2007 08:27:40 UTC
+Last updated 02-Jun-2007 21:09:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-applymbox.html b/git-applymbox.html
index 06e07918b..15ef7a13f 100644
--- a/git-applymbox.html
+++ b/git-applymbox.html
@@ -401,7 +401,7 @@ conversion, even with this flag.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:36 UTC
+Last updated 02-Jun-2007 21:09:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-applypatch.html b/git-applypatch.html
index ecc4cca28..f16f377a4 100644
--- a/git-applypatch.html
+++ b/git-applypatch.html
@@ -331,7 +331,7 @@ information.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:24 UTC
+Last updated 02-Jun-2007 21:09:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-archimport.html b/git-archimport.html
index b0d2fae6f..ed2b1b9a7 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -422,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:24 UTC
+Last updated 02-Jun-2007 21:09:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-archive.html b/git-archive.html
index f5bebdf43..989b7684d 100644
--- a/git-archive.html
+++ b/git-archive.html
@@ -454,7 +454,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ &gt; git-1.4.0-d
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:25 UTC
+Last updated 02-Jun-2007 21:09:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-bisect.html b/git-bisect.html
index 689679452..9a3efda6c 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -431,7 +431,7 @@ know the outcome.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Apr-2007 10:17:28 UTC
+Last updated 02-Jun-2007 21:09:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-blame.html b/git-blame.html
index 122f18420..d83683548 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -683,7 +683,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Apr-2007 18:29:50 UTC
+Last updated 02-Jun-2007 21:09:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-branch.html b/git-branch.html
index f1803a7fb..7a36e1498 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -526,7 +526,7 @@ a branch and check it out with a single command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 16-May-2007 22:46:13 UTC
+Last updated 02-Jun-2007 21:09:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-bundle.html b/git-bundle.html
index 1d22be98e..527776fdf 100644
--- a/git-bundle.html
+++ b/git-bundle.html
@@ -424,7 +424,7 @@ network.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:25 UTC
+Last updated 02-Jun-2007 21:09:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-cat-file.html b/git-cat-file.html
index db4cdd9b3..6bb31dce4 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -366,7 +366,7 @@ be returned.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:28 UTC
+Last updated 02-Jun-2007 21:09:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-attr.html b/git-check-attr.html
index 0dc323ecb..80b613364 100644
--- a/git-check-attr.html
+++ b/git-check-attr.html
@@ -308,7 +308,7 @@ git-check-attr(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-Apr-2007 05:47:49 UTC
+Last updated 02-Jun-2007 21:09:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index 25e7a9983..10e9221b2 100644
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -343,7 +343,7 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:32 UTC
+Last updated 02-Jun-2007 21:09:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout-index.html b/git-checkout-index.html
index 5f5456d13..e685340ae 100644
--- a/git-checkout-index.html
+++ b/git-checkout-index.html
@@ -511,7 +511,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:29 UTC
+Last updated 02-Jun-2007 21:09:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout.html b/git-checkout.html
index 12ca85062..7fea38dc3 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -537,7 +537,7 @@ $ git add frotz</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 24-Apr-2007 07:34:15 UTC
+Last updated 02-Jun-2007 21:09:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 1ee2b6964..40e5c5b70 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -362,7 +362,7 @@ effect to your working tree in a row.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-Apr-2007 07:19:54 UTC
+Last updated 02-Jun-2007 21:09:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry.html b/git-cherry.html
index 80a470385..4f9a597a9 100644
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -348,7 +348,7 @@ than pushing or pulling commits directly.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:32 UTC
+Last updated 02-Jun-2007 21:09:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-clean.html b/git-clean.html
index 7ff3d73de..38741bec5 100644
--- a/git-clean.html
+++ b/git-clean.html
@@ -353,7 +353,7 @@ affected are further limited to those that match them.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 08-May-2007 00:32:26 UTC
+Last updated 02-Jun-2007 21:09:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-clone.html b/git-clone.html
index 6d6882bbb..13a7fdb05 100644
--- a/git-clone.html
+++ b/git-clone.html
@@ -521,7 +521,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 12-May-2007 20:49:27 UTC
+Last updated 02-Jun-2007 21:09:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit-tree.html b/git-commit-tree.html
index 398b2e156..7c7c16b5a 100644
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -482,7 +482,7 @@ reversible operation.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Apr-2007 18:29:50 UTC
+Last updated 02-Jun-2007 21:09:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit.html b/git-commit.html
index dd7e58c6d..49a3a702c 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -664,7 +664,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:34 UTC
+Last updated 02-Jun-2007 21:09:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-config.html b/git-config.html
index ee533dab3..e8762d757 100644
--- a/git-config.html
+++ b/git-config.html
@@ -964,7 +964,8 @@ core.excludeFile
 <p>
         In addition to <em>.gitignore</em> (per-directory) and
         <em>.git/info/exclude</em>, git looks into this file for patterns
-        of files which are not meant to be tracked.
+        of files which are not meant to be tracked.  See
+        <a href="gitignore.html">gitignore(5)</a>.
 </p>
 </dd>
 <dt>
@@ -1526,6 +1527,25 @@ pack.compression
 </p>
 </dd>
 <dt>
+pack.deltaCacheSize
+</dt>
+<dd>
+<p>
+        The maxium memory in bytes used for caching deltas in
+        <a href="git-pack-objects.html">git-pack-objects(1)</a>.
+        A value of 0 means no limit. Defaults to 0.
+</p>
+</dd>
+<dt>
+pack.deltaCacheLimit
+</dt>
+<dd>
+<p>
+        The maxium size of a delta, that is cached in
+        <a href="git-pack-objects.html">git-pack-objects(1)</a>. Defaults to 1000.
+</p>
+</dd>
+<dt>
 pull.octopus
 </dt>
 <dd>
@@ -1757,7 +1777,7 @@ transfer.unpackLimit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 31-May-2007 07:37:48 UTC
+Last updated 02-Jun-2007 21:09:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-convert-objects.html b/git-convert-objects.html
index e1011b7bd..f8c773308 100644
--- a/git-convert-objects.html
+++ b/git-convert-objects.html
@@ -292,7 +292,7 @@ git-convert-objects(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:35 UTC
+Last updated 02-Jun-2007 21:09:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-count-objects.html b/git-count-objects.html
index f57dde8d9..91590828d 100644
--- a/git-count-objects.html
+++ b/git-count-objects.html
@@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:35 UTC
+Last updated 02-Jun-2007 21:09:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index 503382387..8d0549900 100644
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -412,7 +412,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:38 UTC
+Last updated 02-Jun-2007 21:09:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsimport.html b/git-cvsimport.html
index 89383fec1..35afcbf54 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -511,7 +511,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Apr-2007 10:17:28 UTC
+Last updated 02-Jun-2007 21:09:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsserver.html b/git-cvsserver.html
index 13581ca3b..cd57ab376 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -624,7 +624,7 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:38 UTC
+Last updated 02-Jun-2007 21:09:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-daemon.html b/git-daemon.html
index 03c33531a..e9eb77fd1 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -624,7 +624,7 @@ they correspond to these IP addresses.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:37 UTC
+Last updated 02-Jun-2007 21:09:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-describe.html b/git-describe.html
index d1ff5bda4..23d43fb9c 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -428,7 +428,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-May-2007 07:23:05 UTC
+Last updated 02-Jun-2007 21:09:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-files.html b/git-diff-files.html
index 1696cddf4..7141b6723 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1069,7 +1069,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-May-2007 08:52:33 UTC
+Last updated 02-Jun-2007 21:09:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-index.html b/git-diff-index.html
index 513e8c136..bb50f6eb8 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1151,7 +1151,7 @@ always have the special all-zero sha1.</td>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-May-2007 08:52:33 UTC
+Last updated 02-Jun-2007 21:09:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 6de23cf57..d51485071 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1516,7 +1516,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:36 UTC
+Last updated 02-Jun-2007 21:09:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.html b/git-diff.html
index ffdb4bb15..91b667a9b 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -860,7 +860,7 @@ output diff in reverse.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:40 UTC
+Last updated 02-Jun-2007 21:09:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-fast-import.html b/git-fast-import.html
index f92cf9aa2..eb126f4b4 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1203,7 +1203,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-May-2007 23:24:40 UTC
+Last updated 02-Jun-2007 21:09:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch-pack.html b/git-fetch-pack.html
index 7c1e07547..0bfafed4f 100644
--- a/git-fetch-pack.html
+++ b/git-fetch-pack.html
@@ -420,7 +420,7 @@ have a common ancestor commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:41 UTC
+Last updated 02-Jun-2007 21:09:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch.html b/git-fetch.html
index ccb343fa8..4f14d0db7 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -651,7 +651,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Apr-2007 08:21:40 UTC
+Last updated 02-Jun-2007 21:09:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 5d1d62e56..ef74ff53f 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -349,7 +349,7 @@ merge.summary
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:26 UTC
+Last updated 02-Jun-2007 21:09:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index ed89ad62d..cddabb5e3 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -491,7 +491,7 @@ eval "$eval"</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:26 UTC
+Last updated 02-Jun-2007 21:09:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.html b/git-format-patch.html
index d367f3cd5..82587c903 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -889,7 +889,7 @@ git-format-patch -3
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 12-Apr-2007 05:02:29 UTC
+Last updated 02-Jun-2007 21:09:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-fsck-objects.html b/git-fsck-objects.html
index 89e176af8..5939d8e6b 100644
--- a/git-fsck-objects.html
+++ b/git-fsck-objects.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:43 UTC
+Last updated 02-Jun-2007 21:09:40 UTC
 </div>
 </div>
 </body>
diff --git a/git-fsck.html b/git-fsck.html
index 0b549c21e..b469e78d8 100644
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -502,7 +502,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Apr-2007 00:51:16 UTC
+Last updated 02-Jun-2007 21:09:40 UTC
 </div>
 </div>
 </body>
diff --git a/git-gc.html b/git-gc.html
index 541cdaab6..95fc83d38 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -309,10 +309,10 @@ operating performance.</p>
 <dd>
 <p>
         Usually <em>git-gc</em> runs very quickly while providing good disk
-        space utilization and performance.   This option will cause
-        git-gc to more aggressive optimize the repository at the expense
+        space utilization and performance.  This option will cause
+        git-gc to more aggressively optimize the repository at the expense
         of taking much more time.  The effects of this optimization are
-        persistent, so this option only needs to be sporadically; every
+        persistent, so this option only needs to be used occasionally; every
         few hundred changesets or so.
 </p>
 </dd>
@@ -367,7 +367,7 @@ more details.  This defaults to 10.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-May-2007 19:11:25 UTC
+Last updated 02-Jun-2007 21:09:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-gc.txt b/git-gc.txt
index 4ac839f93..c7742ca96 100644
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -37,10 +37,10 @@ OPTIONS
 
 --aggressive::
 	Usually 'git-gc' runs very quickly while providing good disk
-	space utilization and performance.   This option will cause
-	git-gc to more aggressive optimize the repository at the expense
+	space utilization and performance.  This option will cause
+	git-gc to more aggressively optimize the repository at the expense
 	of taking much more time.  The effects of this optimization are
-	persistent, so this option only needs to be sporadically; every
+	persistent, so this option only needs to be used occasionally; every
 	few hundred changesets or so.
 
 Configuration
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html
index 63eadbc08..2c42439be 100644
--- a/git-get-tar-commit-id.html
+++ b/git-get-tar-commit-id.html
@@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:44 UTC
+Last updated 02-Jun-2007 21:09:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-grep.html b/git-grep.html
index 0c07ee6ee..9ba233f85 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -528,7 +528,7 @@ revamped by Junio C Hamano.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Apr-2007 08:21:41 UTC
+Last updated 02-Jun-2007 21:09:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-hash-object.html b/git-hash-object.html
index a60ddc777..8fb62d0b5 100644
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -327,7 +327,7 @@ specified, it defaults to "blob".</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:45 UTC
+Last updated 02-Jun-2007 21:09:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-fetch.html b/git-http-fetch.html
index 3abae8377..a3221f205 100644
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -369,7 +369,7 @@ commit-id
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Apr-2007 08:21:42 UTC
+Last updated 02-Jun-2007 21:09:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-push.html b/git-http-push.html
index 3fd7de527..ae8008fed 100644
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -412,7 +412,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Apr-2007 08:21:43 UTC
+Last updated 02-Jun-2007 21:09:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-imap-send.html b/git-imap-send.html
index 301fc4cc8..32115ac1f 100644
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -320,7 +320,7 @@ configuration file (shown with examples):</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:46 UTC
+Last updated 02-Jun-2007 21:09:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-index-pack.html b/git-index-pack.html
index f7662f5c1..0c7d4c652 100644
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -398,7 +398,7 @@ mentioned above.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:26 UTC
+Last updated 02-Jun-2007 21:09:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-init-db.html b/git-init-db.html
index d41392344..2876ce0ae 100644
--- a/git-init-db.html
+++ b/git-init-db.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:46 UTC
+Last updated 02-Jun-2007 21:09:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-init.html b/git-init.html
index 6add5d9fc..9137a65c4 100644
--- a/git-init.html
+++ b/git-init.html
@@ -395,7 +395,7 @@ add all existing file to the index
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:47 UTC
+Last updated 02-Jun-2007 21:09:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-instaweb.html b/git-instaweb.html
index 15572702b..df9bfd3d6 100644
--- a/git-instaweb.html
+++ b/git-instaweb.html
@@ -390,7 +390,7 @@ repository.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:26 UTC
+Last updated 02-Jun-2007 21:09:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-local-fetch.html b/git-local-fetch.html
index 1655ac272..43c1c3d6d 100644
--- a/git-local-fetch.html
+++ b/git-local-fetch.html
@@ -390,7 +390,7 @@ git-local-fetch(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:26 UTC
+Last updated 02-Jun-2007 21:09:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-log.html b/git-log.html
index 95955ff5b..b7b12eb3f 100644
--- a/git-log.html
+++ b/git-log.html
@@ -787,7 +787,7 @@ reversible operation.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:36 UTC
+Last updated 02-Jun-2007 21:09:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-lost-found.html b/git-lost-found.html
index eb8ec615c..2d239258e 100644
--- a/git-lost-found.html
+++ b/git-lost-found.html
@@ -338,7 +338,7 @@ $ git rev-parse not-lost-anymore
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Apr-2007 08:27:41 UTC
+Last updated 02-Jun-2007 21:09:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-files.html b/git-ls-files.html
index 57acf378f..05024be4c 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -551,128 +551,43 @@ respectively.</p>
 <div class="sectionbody">
 <p><em>git-ls-files</em> can use a list of "exclude patterns" when
 traversing the directory tree and finding files to show when the
-flags --others or --ignored are specified.</p>
-<p>These exclude patterns come from these places:</p>
+flags --others or --ignored are specified.  <a href="gitignore.html">gitignore(5)</a>
+specifies the format of exclude patterns.</p>
+<p>These exclude patterns come from these places, in order:</p>
 <ol>
 <li>
 <p>
-command line flag --exclude=&lt;pattern&gt; specifies a single
-     pattern.
+The command line flag --exclude=&lt;pattern&gt; specifies a
+     single pattern.  Patterns are ordered in the same order
+     they appear in the command line.
 </p>
 </li>
 <li>
 <p>
-command line flag --exclude-from=&lt;file&gt; specifies a list of
-     patterns stored in a file.
+The command line flag --exclude-from=&lt;file&gt; specifies a
+     file containing a list of patterns.  Patterns are ordered
+     in the same order they appear in the file.
 </p>
 </li>
 <li>
 <p>
 command line flag --exclude-per-directory=&lt;name&gt; specifies
      a name of the file in each directory <em>git-ls-files</em>
-     examines, and if exists, its contents are used as an
-     additional list of patterns.
+     examines, normally <tt>.gitignore</tt>.  Files in deeper
+     directories take precedence.  Patterns are ordered in the
+     same order they appear in the files.
 </p>
 </li>
 </ol>
-<p>An exclude pattern file used by (2) and (3) contains one pattern
-per line.  A line that starts with a <em>#</em> can be used as comment
-for readability.</p>
-<p>There are three lists of patterns that are in effect at a given
-time.  They are built and ordered in the following way:</p>
-<ul>
-<li>
-<p>
---exclude=&lt;pattern&gt; from the command line; patterns are
-   ordered in the same order as they appear on the command line.
-</p>
-</li>
-<li>
-<p>
-lines read from --exclude-from=&lt;file&gt;; patterns are ordered
-   in the same order as they appear in the file.
-</p>
-</li>
-<li>
-<p>
-When --exclude-per-directory=&lt;name&gt; is specified, upon
-   entering a directory that has such a file, its contents are
-   appended at the end of the current "list of patterns".  They
-   are popped off when leaving the directory.
-</p>
-</li>
-</ul>
-<p>Each pattern in the pattern list specifies "a match pattern" and
-optionally the fate; either a file that matches the pattern is
-considered excluded or included.  A filename is matched against
-the patterns in the three lists; the --exclude-from list is
-checked first, then the --exclude-per-directory list, and then
-finally the --exclude list. The last match determines its fate.
-If there is no match in the three lists, the fate is "included".</p>
 <p>A pattern specified on the command line with --exclude or read
 from the file specified with --exclude-from is relative to the
 top of the directory tree.  A pattern read from a file specified
 by --exclude-per-directory is relative to the directory that the
 pattern file appears in.</p>
-<p>An exclude pattern is of the following format:</p>
-<ul>
-<li>
-<p>
-an optional prefix <em>!</em> which means that the fate this pattern
-   specifies is "include", not the usual "exclude"; the
-   remainder of the pattern string is interpreted according to
-   the following rules.
-</p>
-</li>
-<li>
-<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.
-</p>
-</li>
-<li>
-<p>
-otherwise, it is a shell glob pattern, suitable for
-   consumption by fnmatch(3) with FNM_PATHNAME flag.  I.e. a
-   slash in the pattern must match a slash in the pathname.
-   "Documentation/*.html" matches "Documentation/git.html" but
-   not "ppc/ppc.html".  As a natural exception, "/*.c" matches
-   "cat-file.c" but not "mozilla-sha1/sha1.c".
-</p>
-</li>
-</ul>
-<p>An example:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt>    $ cat .git/info/exclude
-    # ignore objects and archives, anywhere in the tree.
-    *.[oa]
-    $ cat Documentation/.gitignore
-    # ignore generated html files,
-    *.html
-    # except foo.html which is maintained by hand
-    !foo.html
-    $ git-ls-files --ignored \
-        --exclude='Documentation/*.[0-9]' \
-        --exclude-from=.git/info/exclude \
-        --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">
-<p><a href="git-read-tree.html">git-read-tree(1)</a></p>
+<p><a href="git-read-tree.html">git-read-tree(1)</a>, <a href="gitignore.html">gitignore(5)</a></p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -680,7 +595,7 @@ from getting ignored.</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
-<p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
+<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
@@ -688,7 +603,7 @@ from getting ignored.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-May-2007 04:28:37 UTC
+Last updated 02-Jun-2007 21:09:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt
index 43e0d2266..a78a9ff1b 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -139,46 +139,24 @@ Exclude Patterns
 
 'git-ls-files' can use a list of "exclude patterns" when
 traversing the directory tree and finding files to show when the
-flags --others or --ignored are specified.
+flags --others or --ignored are specified.  gitlink:gitignore[5]
+specifies the format of exclude patterns.
 
-These exclude patterns come from these places:
+These exclude patterns come from these places, in order:
 
-  1. command line flag --exclude=<pattern> specifies a single
-     pattern.
+  1. The command line flag --exclude=<pattern> specifies a
+     single pattern.  Patterns are ordered in the same order
+     they appear in the command line.
 
-  2. command line flag --exclude-from=<file> specifies a list of
-     patterns stored in a file.
+  2. The command line flag --exclude-from=<file> specifies a
+     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
      a name of the file in each directory 'git-ls-files'
-     examines, and if exists, its contents are used as an
-     additional list of patterns.
-
-An exclude pattern file used by (2) and (3) contains one pattern
-per line.  A line that starts with a '#' can be used as comment
-for readability.
-
-There are three lists of patterns that are in effect at a given
-time.  They are built and ordered in the following way:
-
- * --exclude=<pattern> from the command line; patterns are
-   ordered in the same order as they appear on the command line.
-
- * lines read from --exclude-from=<file>; patterns are ordered
-   in the same order as they appear in the file.
-
- * When --exclude-per-directory=<name> is specified, upon
-   entering a directory that has such a file, its contents are
-   appended at the end of the current "list of patterns".  They
-   are popped off when leaving the directory.
-
-Each pattern in the pattern list specifies "a match pattern" and
-optionally the fate; either a file that matches the pattern is
-considered excluded or included.  A filename is matched against
-the patterns in the three lists; the --exclude-from list is
-checked first, then the --exclude-per-directory list, and then
-finally the --exclude list. The last match determines its fate.
-If there is no match in the three lists, the fate is "included".
+     examines, normally `.gitignore`.  Files in deeper
+     directories take precedence.  Patterns are ordered in the
+     same order they appear in the files.
 
 A pattern specified on the command line with --exclude or read
 from the file specified with --exclude-from is relative to the
@@ -186,58 +164,9 @@ top of the directory tree.  A pattern read from a file specified
 by --exclude-per-directory is relative to the directory that the
 pattern file appears in.
 
-An exclude pattern is of the following format:
-
- - an optional prefix '!' which means that the fate this pattern
-   specifies is "include", not the usual "exclude"; the
-   remainder of the pattern string is interpreted according to
-   the following rules.
-
- - if it does not contain a slash '/', it is a shell glob
-   pattern and used to match against the filename without
-   leading directories.
-
- - otherwise, it is a shell glob pattern, suitable for
-   consumption by fnmatch(3) with FNM_PATHNAME flag.  I.e. a
-   slash in the pattern must match a slash in the pathname.
-   "Documentation/\*.html" matches "Documentation/git.html" but
-   not "ppc/ppc.html".  As a natural exception, "/*.c" matches
-   "cat-file.c" but not "mozilla-sha1/sha1.c".
-
-An example:
-
---------------------------------------------------------------
-    $ cat .git/info/exclude
-    # ignore objects and archives, anywhere in the tree.
-    *.[oa]
-    $ cat Documentation/.gitignore
-    # ignore generated html files,
-    *.html
-    # except foo.html which is maintained by hand
-    !foo.html
-    $ git-ls-files --ignored \
-        --exclude='Documentation/*.[0-9]' \
-        --exclude-from=.git/info/exclude \
-        --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
 --------
-gitlink:git-read-tree[1]
+gitlink:git-read-tree[1], gitlink:gitignore[5]
 
 
 Author
@@ -246,7 +175,7 @@ Written by Linus Torvalds <torvalds@osdl.org>
 
 Documentation
 --------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
diff --git a/git-ls-remote.html b/git-ls-remote.html
index 72cb406f9..2afe062a1 100644
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:49 UTC
+Last updated 02-Jun-2007 21:09:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-tree.html b/git-ls-tree.html
index 07c521ac2..334185bcc 100644
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -416,7 +416,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-May-2007 21:46:09 UTC
+Last updated 02-Jun-2007 21:09:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailinfo.html b/git-mailinfo.html
index 5b24f53bd..f74ee53ff 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -357,7 +357,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:37 UTC
+Last updated 02-Jun-2007 21:09:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailsplit.html b/git-mailsplit.html
index 958625715..1e2c0570d 100644
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -362,7 +362,7 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-May-2007 05:01:02 UTC
+Last updated 02-Jun-2007 21:09:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-base.html b/git-merge-base.html
index 0c2f4a662..fa54cff01 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -312,7 +312,7 @@ relied on to decide in any particular way.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:50 UTC
+Last updated 02-Jun-2007 21:09:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-file.html b/git-merge-file.html
index 5db3b8242..347e5cd87 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:50 UTC
+Last updated 02-Jun-2007 21:09:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-index.html b/git-merge-index.html
index ed0fbbc92..93ee1a917 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:51 UTC
+Last updated 02-Jun-2007 21:09:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index b5ea8cad4..70b2e8f6a 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -294,7 +294,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:51 UTC
+Last updated 02-Jun-2007 21:09:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-tree.html b/git-merge-tree.html
index 06d48df98..03e710076 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -300,7 +300,7 @@ entries that match &lt;branch1&gt; tree.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:51 UTC
+Last updated 02-Jun-2007 21:09:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.html b/git-merge.html
index f056cefc6..fe792c4a6 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -579,7 +579,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:39 UTC
+Last updated 02-Jun-2007 21:09:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-mergetool.html b/git-mergetool.html
index 0601ca696..8a90225b8 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -316,7 +316,7 @@ will pick a suitable default.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-May-2007 07:07:21 UTC
+Last updated 02-Jun-2007 21:09:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktag.html b/git-mktag.html
index 81c187d55..ce4f83ed9 100644
--- a/git-mktag.html
+++ b/git-mktag.html
@@ -309,7 +309,7 @@ size, you're doing something wrong)</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:52 UTC
+Last updated 02-Jun-2007 21:09:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktree.html b/git-mktree.html
index 3caef596f..fd3d5b7ed 100644
--- a/git-mktree.html
+++ b/git-mktree.html
@@ -307,7 +307,7 @@ built is written to the standard output.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:52 UTC
+Last updated 02-Jun-2007 21:09:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-mv.html b/git-mv.html
index fecfe0869..8afdb6ff1 100644
--- a/git-mv.html
+++ b/git-mv.html
@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer &lt;Josef.Weidendorfer@gmx.de&gt;
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:53 UTC
+Last updated 02-Jun-2007 21:09:50 UTC
 </div>
 </div>
 </body>
diff --git a/git-name-rev.html b/git-name-rev.html
index 80b261b11..e89394426 100644
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -364,7 +364,7 @@ not the context.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-May-2007 07:23:07 UTC
+Last updated 02-Jun-2007 21:09:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-p4import.html b/git-p4import.html
index 558f487e6..47b8076c5 100644
--- a/git-p4import.html
+++ b/git-p4import.html
@@ -463,7 +463,7 @@ of mappings with each line containing one mapping in the format:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:27 UTC
+Last updated 02-Jun-2007 21:09:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-objects.html b/git-pack-objects.html
index 8579d4fbf..88ca8fcd0 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -538,7 +538,7 @@ base-name
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:39 UTC
+Last updated 02-Jun-2007 21:09:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index 9e4b7c639..18963e815 100644
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -335,7 +335,7 @@ objects.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:54 UTC
+Last updated 02-Jun-2007 21:09:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-refs.html b/git-pack-refs.html
index fff7c4c2e..8b3731ad3 100644
--- a/git-pack-refs.html
+++ b/git-pack-refs.html
@@ -336,7 +336,7 @@ hierarchy after packing them.  This option tells it not to.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:55 UTC
+Last updated 02-Jun-2007 21:09:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-parse-remote.html b/git-parse-remote.html
index da421faee..d30acafff 100644
--- a/git-parse-remote.html
+++ b/git-parse-remote.html
@@ -326,7 +326,7 @@ get_remote_refs_for_push
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:55 UTC
+Last updated 02-Jun-2007 21:09:53 UTC
 </div>
 </div>
 </body>
diff --git a/git-patch-id.html b/git-patch-id.html
index dac1a2a7b..00dc5305d 100644
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:55 UTC
+Last updated 02-Jun-2007 21:09:53 UTC
 </div>
 </div>
 </body>
diff --git a/git-peek-remote.html b/git-peek-remote.html
index d5c264f7c..2f6b2f481 100644
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -341,7 +341,7 @@ stores them in the local repository under the same name.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:56 UTC
+Last updated 02-Jun-2007 21:09:53 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune-packed.html b/git-prune-packed.html
index e55ebbbfe..f418322be 100644
--- a/git-prune-packed.html
+++ b/git-prune-packed.html
@@ -325,7 +325,7 @@ disk storage, etc.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:56 UTC
+Last updated 02-Jun-2007 21:09:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune.html b/git-prune.html
index 4e10ef693..27902f9bd 100644
--- a/git-prune.html
+++ b/git-prune.html
@@ -340,7 +340,7 @@ borrows from your repository via its
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:56 UTC
+Last updated 02-Jun-2007 21:09:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-pull.html b/git-pull.html
index 87c54b7ea..0ada48449 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -896,7 +896,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:40 UTC
+Last updated 02-Jun-2007 21:09:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-push.html b/git-push.html
index b1721ac70..e334d1c84 100644
--- a/git-push.html
+++ b/git-push.html
@@ -554,7 +554,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:27 UTC
+Last updated 02-Jun-2007 21:09:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-quiltimport.html b/git-quiltimport.html
index b7473a76c..a202a9df8 100644
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -339,7 +339,7 @@ variable.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:33:58 UTC
+Last updated 02-Jun-2007 21:09:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-read-tree.html b/git-read-tree.html
index 860ef4762..24d8f153e 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -683,7 +683,8 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <h2>See Also</h2>
 <div class="sectionbody">
-<p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a></p>
+<p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a>;
+<a href="gitignore.html">gitignore(5)</a></p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -699,7 +700,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Apr-2007 10:17:29 UTC
+Last updated 02-Jun-2007 21:09:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-read-tree.txt b/git-read-tree.txt
index 019c8bef7..acb57447a 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -341,7 +341,8 @@ have finished your work-in-progress), attempt the merge again.
 
 See Also
 --------
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1]
+gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
+gitlink:gitignore[5]
 
 
 Author
diff --git a/git-rebase.html b/git-rebase.html
index 90bc456bf..e00b89c4c 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -596,7 +596,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-May-2007 04:51:27 UTC
+Last updated 02-Jun-2007 21:09:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-receive-pack.html b/git-receive-pack.html
index 70890378d..dd6d5742b 100644
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -425,7 +425,7 @@ exec git-update-server-info</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:05 UTC
+Last updated 02-Jun-2007 21:09:59 UTC
 </div>
 </div>
 </body>
diff --git a/git-reflog.html b/git-reflog.html
index 83da0f3e7..a3a8318e1 100644
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -343,7 +343,7 @@ the current branch. It is basically an alias for <em>git log -g --abbrev-commit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:06 UTC
+Last updated 02-Jun-2007 21:10:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-relink.html b/git-relink.html
index 32b72d282..f4672ed44 100644
--- a/git-relink.html
+++ b/git-relink.html
@@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:07 UTC
+Last updated 02-Jun-2007 21:10:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-remote.html b/git-remote.html
index 6d157b54a..ef2fadc5b 100644
--- a/git-remote.html
+++ b/git-remote.html
@@ -410,7 +410,7 @@ $ git merge origin</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-May-2007 08:52:36 UTC
+Last updated 02-Jun-2007 21:10:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-repack.html b/git-repack.html
index e3b12944f..5a57a58a2 100644
--- a/git-repack.html
+++ b/git-repack.html
@@ -404,7 +404,7 @@ that way can try to use older git with it).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-May-2007 09:17:40 UTC
+Last updated 02-Jun-2007 21:10:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-repo-config.html b/git-repo-config.html
index ae3a0ba36..6ded6d1d7 100644
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:10 UTC
+Last updated 02-Jun-2007 21:10:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-request-pull.html b/git-request-pull.html
index 1cd996a73..d40bf7753 100644
--- a/git-request-pull.html
+++ b/git-request-pull.html
@@ -322,7 +322,7 @@ the given URL in the generated summary.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:10 UTC
+Last updated 02-Jun-2007 21:10:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-rerere.html b/git-rerere.html
index e9d6132d3..6da34695a 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -481,7 +481,7 @@ conflict.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:11 UTC
+Last updated 02-Jun-2007 21:10:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-reset.html b/git-reset.html
index f5ab326d1..aae51cb97 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 24-Apr-2007 07:34:16 UTC
+Last updated 02-Jun-2007 21:10:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.html b/git-rev-list.html
index 7292dc3f0..74407a00e 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1074,7 +1074,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-May-2007 06:13:41 UTC
+Last updated 02-Jun-2007 21:10:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 20bbf50bd..f7aaa5170 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -709,7 +709,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-May-2007 23:24:42 UTC
+Last updated 02-Jun-2007 21:10:08 UTC
 </div>
 </div>
 </body>
diff --git a/git-revert.html b/git-revert.html
index e02c040d3..1c9a20af8 100644
--- a/git-revert.html
+++ b/git-revert.html
@@ -345,7 +345,7 @@ effect to your working tree in a row.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:12 UTC
+Last updated 02-Jun-2007 21:10:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-rm.html b/git-rm.html
index 65b7e3ee3..f43147f59 100644
--- a/git-rm.html
+++ b/git-rm.html
@@ -414,7 +414,7 @@ git-rm -f git-*.sh
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-Apr-2007 04:57:05 UTC
+Last updated 02-Jun-2007 21:10:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-runstatus.html b/git-runstatus.html
index 5315520c9..6689e0a16 100644
--- a/git-runstatus.html
+++ b/git-runstatus.html
@@ -355,7 +355,7 @@ of git-commit, and later rewritten in C by Jeff King.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:15 UTC
+Last updated 02-Jun-2007 21:10:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-email.html b/git-send-email.html
index 4d364aaf5..1178c41cc 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -496,7 +496,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-May-2007 03:05:35 UTC
+Last updated 02-Jun-2007 21:10:11 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-pack.html b/git-send-pack.html
index 42106e9f2..ec2a3421f 100644
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -443,7 +443,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:17 UTC
+Last updated 02-Jun-2007 21:10:11 UTC
 </div>
 </div>
 </body>
diff --git a/git-sh-setup.html b/git-sh-setup.html
index e5e5edd70..c1f98d478 100644
--- a/git-sh-setup.html
+++ b/git-sh-setup.html
@@ -364,7 +364,7 @@ require_work_tree
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:24 UTC
+Last updated 02-Jun-2007 21:10:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-shell.html b/git-shell.html
index a581a0d32..0a2188d51 100644
--- a/git-shell.html
+++ b/git-shell.html
@@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:18 UTC
+Last updated 02-Jun-2007 21:10:11 UTC
 </div>
 </div>
 </body>
diff --git a/git-shortlog.html b/git-shortlog.html
index fed7bf59f..c1f1a7845 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -344,7 +344,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Apr-2007 18:29:50 UTC
+Last updated 02-Jun-2007 21:10:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.html b/git-show-branch.html
index 4a70a026e..b1f44abb2 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -521,7 +521,7 @@ topologically related with each other.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:20 UTC
+Last updated 02-Jun-2007 21:10:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-index.html b/git-show-index.html
index 621b8cf9e..f0826b0b5 100644
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -296,7 +296,7 @@ offset and SHA1 of each object.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:21 UTC
+Last updated 02-Jun-2007 21:10:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-ref.html b/git-show-ref.html
index 45c2cc3ee..e22e8b066 100644
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -460,7 +460,7 @@ Man page by Jonas Fonseca &lt;fonseca@diku.dk&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-Apr-2007 21:31:10 UTC
+Last updated 02-Jun-2007 21:10:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-show.html b/git-show.html
index 2731ef5e9..78323e768 100644
--- a/git-show.html
+++ b/git-show.html
@@ -739,7 +739,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:38 UTC
+Last updated 02-Jun-2007 21:10:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html
index 46f3bedf0..38bfd1bf0 100644
--- a/git-ssh-fetch.html
+++ b/git-ssh-fetch.html
@@ -349,7 +349,7 @@ commit-id
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:25 UTC
+Last updated 02-Jun-2007 21:10:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-ssh-upload.html b/git-ssh-upload.html
index 49448a092..4b85f7c7d 100644
--- a/git-ssh-upload.html
+++ b/git-ssh-upload.html
@@ -348,7 +348,7 @@ commit-id
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:26 UTC
+Last updated 02-Jun-2007 21:10:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-status.html b/git-status.html
index 50dd9cd85..01dda6db1 100644
--- a/git-status.html
+++ b/git-status.html
@@ -300,10 +300,10 @@ template comments, and all the output lines are prefixed with <em>#</em>.</p>
 mean the same thing and the latter is kept for backward
 compatibility) and <tt>color.status.&lt;slot&gt;</tt> configuration variables
 to colorize its output.</p>
-<p>As for <a href="git-add.html">git-add(1)</a>, the configuration variable
-<em>core.excludesfile</em> can indicate a path to a file containing patterns
-of file names to exclude, in addition to patterns given in
-<em>info/exclude</em> and <em>.gitignore</em>.</p>
+</div>
+<h2>See Also</h2>
+<div class="sectionbody">
+<p><a href="gitignore.html">gitignore(5)</a></p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -320,7 +320,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-May-2007 07:23:07 UTC
+Last updated 02-Jun-2007 21:10:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-status.txt b/git-status.txt
index d7015387b..1fd1af102 100644
--- a/git-status.txt
+++ b/git-status.txt
@@ -42,11 +42,9 @@ mean the same thing and the latter is kept for backward
 compatibility) and `color.status.<slot>` configuration variables
 to colorize its output.
 
-As for gitlink:git-add[1], the configuration variable
-'core.excludesfile' can indicate a path to a file containing patterns
-of file names to exclude, in addition to patterns given in
-'info/exclude' and '.gitignore'.
-
+See Also
+--------
+gitlink:gitignore[5]
 
 Author
 ------
diff --git a/git-stripspace.html b/git-stripspace.html
index 543e03953..4fe1435b4 100644
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -305,7 +305,7 @@ git-stripspace(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:27 UTC
+Last updated 02-Jun-2007 21:10:14 UTC
 </div>
 </div>
 </body>
diff --git a/git-svn.html b/git-svn.html
index 72e459bc1..69acb9ccc 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -1003,7 +1003,7 @@ should be manually entered with a text-editor or using
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-May-2007 08:52:37 UTC
+Last updated 02-Jun-2007 21:10:14 UTC
 </div>
 </div>
 </body>
diff --git a/git-svnimport.html b/git-svnimport.html
index ce358684a..845c55551 100644
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -534,7 +534,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:27 UTC
+Last updated 02-Jun-2007 21:10:14 UTC
 </div>
 </div>
 </body>
diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index 5b6300f02..90c2421a7 100644
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:29 UTC
+Last updated 02-Jun-2007 21:10:14 UTC
 </div>
 </div>
 </body>
diff --git a/git-tag.html b/git-tag.html
index 80358e084..1298a31c0 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -521,7 +521,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-May-2007 07:07:21 UTC
+Last updated 02-Jun-2007 21:10:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-tar-tree.html b/git-tar-tree.html
index e01a64691..ab8b37dd1 100644
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -395,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs &gt; git-1.4.0-docs.tar
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Apr-2007 02:58:27 UTC
+Last updated 02-Jun-2007 21:10:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-tools.html b/git-tools.html
index c496401d1..3d6a4ec6b 100644
--- a/git-tools.html
+++ b/git-tools.html
@@ -433,7 +433,7 @@ comprehensive list.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:46 UTC
+Last updated 02-Jun-2007 21:10:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-file.html b/git-unpack-file.html
index 9e6fc9251..7e90abd82 100644
--- a/git-unpack-file.html
+++ b/git-unpack-file.html
@@ -307,7 +307,7 @@ returns the name of the temporary file in the following format:
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:31 UTC
+Last updated 02-Jun-2007 21:10:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 7f20d435e..c36578699 100644
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -333,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:31 UTC
+Last updated 02-Jun-2007 21:10:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-index.html b/git-update-index.html
index d25f189d7..3a993edbc 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -721,7 +721,7 @@ from symbolic link to regular file.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 08-May-2007 00:32:27 UTC
+Last updated 02-Jun-2007 21:10:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-ref.html b/git-update-ref.html
index 046d819fc..536d155ee 100644
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -360,7 +360,7 @@ or does not have committer information available.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-May-2007 19:11:27 UTC
+Last updated 02-Jun-2007 21:10:16 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-server-info.html b/git-update-server-info.html
index 392c1c40b..5cd030a09 100644
--- a/git-update-server-info.html
+++ b/git-update-server-info.html
@@ -332,7 +332,7 @@ info/refs file unless <tt>--force</tt> flag is given.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:33 UTC
+Last updated 02-Jun-2007 21:10:16 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-archive.html b/git-upload-archive.html
index 1e14a2e84..794d0b8b3 100644
--- a/git-upload-archive.html
+++ b/git-upload-archive.html
@@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:35 UTC
+Last updated 02-Jun-2007 21:10:16 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-pack.html b/git-upload-pack.html
index 96fe09479..f58a983aa 100644
--- a/git-upload-pack.html
+++ b/git-upload-pack.html
@@ -326,7 +326,7 @@ repository.  For push operations, see <em>git-send-pack</em>.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:34 UTC
+Last updated 02-Jun-2007 21:10:16 UTC
 </div>
 </div>
 </body>
diff --git a/git-var.html b/git-var.html
index 5ae49b996..826766235 100644
--- a/git-var.html
+++ b/git-var.html
@@ -372,7 +372,7 @@ Your sysadmin must hate you!
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:35 UTC
+Last updated 02-Jun-2007 21:10:16 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-pack.html b/git-verify-pack.html
index 8c1412539..01c04c35c 100644
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -338,7 +338,7 @@ corresponding pack file.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:36 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-tag.html b/git-verify-tag.html
index 2cb62151f..a59c3e066 100644
--- a/git-verify-tag.html
+++ b/git-verify-tag.html
@@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:36 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-whatchanged.html b/git-whatchanged.html
index 198ac74c8..b1ccc5852 100644
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -384,7 +384,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:37 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-write-tree.html b/git-write-tree.html
index 3d17ce2f3..dad541cd8 100644
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -323,7 +323,7 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:37 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/git.html b/git.html
index 2eeef129c..057b7523f 100644
--- a/git.html
+++ b/git.html
@@ -2333,7 +2333,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-May-2007 09:08:17 UTC
+Last updated 02-Jun-2007 21:10:18 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.html b/gitattributes.html
index 46825d921..13e9bc83e 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -658,7 +658,7 @@ frotz   unspecified</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-May-2007 03:12:38 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/gitignore.html b/gitignore.html
new file mode 100644
index 000000000..71d43f2d2
--- /dev/null
+++ b/gitignore.html
@@ -0,0 +1,410 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
+<style type="text/css">
+/* Debug borders */
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
+/*
+  border: 1px solid red;
+*/
+}
+
+body {
+  margin: 1em 5% 1em 5%;
+}
+
+a { color: blue; }
+a:visited { color: fuchsia; }
+
+em {
+  font-style: italic;
+}
+
+strong {
+  font-weight: bold;
+}
+
+tt {
+  color: navy;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #527bbd;
+  font-family: sans-serif;
+  margin-top: 1.2em;
+  margin-bottom: 0.5em;
+  line-height: 1.3;
+}
+
+h1 {
+  border-bottom: 2px solid silver;
+}
+h2 {
+  border-bottom: 2px solid silver;
+  padding-top: 0.5em;
+}
+
+div.sectionbody {
+  font-family: serif;
+  margin-left: 0;
+}
+
+hr {
+  border: 1px solid silver;
+}
+
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
+pre {
+  padding: 0;
+  margin: 0;
+}
+
+span#author {
+  color: #527bbd;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+span#email {
+}
+span#revision {
+  font-family: sans-serif;
+}
+
+div#footer {
+  font-family: sans-serif;
+  font-size: small;
+  border-top: 2px solid silver;
+  padding-top: 0.5em;
+  margin-top: 4.0em;
+}
+div#footer-text {
+  float: left;
+  padding-bottom: 0.5em;
+}
+div#footer-badges {
+  float: right;
+  padding-bottom: 0.5em;
+}
+
+div#preamble,
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
+div.admonitionblock {
+  margin-right: 10%;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+div.admonitionblock {
+  margin-top: 2.5em;
+  margin-bottom: 2.5em;
+}
+
+div.content { /* Block element content. */
+  padding: 0;
+}
+
+/* Block element titles. */
+div.title, caption.title {
+  font-family: sans-serif;
+  font-weight: bold;
+  text-align: left;
+  margin-top: 1.0em;
+  margin-bottom: 0.5em;
+}
+div.title + * {
+  margin-top: 0;
+}
+
+td div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content + div.title {
+  margin-top: 0.0em;
+}
+
+div.sidebarblock > div.content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+
+div.listingblock > div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock > div.content {
+  padding-left: 2.0em;
+}
+div.quoteblock .attribution {
+  text-align: right;
+}
+
+div.admonitionblock .icon {
+  vertical-align: top;
+  font-size: 1.1em;
+  font-weight: bold;
+  text-decoration: underline;
+  color: #527bbd;
+  padding-right: 0.5em;
+}
+div.admonitionblock td.content {
+  padding-left: 0.5em;
+  border-left: 2px solid silver;
+}
+
+div.exampleblock > div.content {
+  border-left: 2px solid silver;
+  padding: 0.5em;
+}
+
+div.verseblock div.content {
+  white-space: pre;
+}
+
+div.imageblock div.content { padding-left: 0; }
+div.imageblock img { border: 1px solid silver; }
+span.image img { border-style: none; }
+
+dl {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+dt {
+  margin-top: 0.5em;
+  margin-bottom: 0;
+  font-style: italic;
+}
+dd > *:first-child {
+  margin-top: 0;
+}
+
+ul, ol {
+    list-style-position: outside;
+}
+ol.olist2 {
+  list-style-type: lower-alpha;
+}
+
+div.tableblock > table {
+  border-color: #527bbd;
+  border-width: 3px;
+}
+thead {
+  font-family: sans-serif;
+  font-weight: bold;
+}
+tfoot {
+  font-weight: bold;
+}
+
+div.hlist {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+td.hlist1 {
+  vertical-align: top;
+  font-style: italic;
+  padding-right: 0.8em;
+}
+td.hlist2 {
+  vertical-align: top;
+}
+
+@media print {
+  div#footer-badges { display: none; }
+}
+include::./stylesheets/xhtml11-manpage.css[]
+/* Workarounds for IE6's broken and incomplete CSS2. */
+
+div.sidebar-content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+div.sidebar-title, div.image-title {
+  font-family: sans-serif;
+  font-weight: bold;
+  margin-top: 0.0em;
+  margin-bottom: 0.5em;
+}
+
+div.listingblock div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock-content {
+  padding-left: 2.0em;
+}
+
+div.exampleblock-content {
+  border-left: 2px solid silver;
+  padding-left: 0.5em;
+}
+</style>
+<title>gitignore(5)</title>
+</head>
+<body>
+<div id="header">
+<h1>
+gitignore(5) Manual Page
+</h1>
+<h2>NAME</h2>
+<div class="sectionbody">
+<p>gitignore -
+   Specifies intentionally untracked files to ignore
+</p>
+</div>
+</div>
+<h2>SYNOPSIS</h2>
+<div class="sectionbody">
+<p>$GIT_DIR/info/exclude, .gitignore</p>
+</div>
+<h2>DESCRIPTION</h2>
+<div class="sectionbody">
+<p>A <tt>gitignore</tt> file specifies intentionally untracked files that
+git should ignore.  Each line in a <tt>gitignore</tt> file specifies a
+pattern.</p>
+<p>When deciding whether to ignore a path, git normally checks
+<tt>gitignore</tt> patterns from multiple sources, with the following
+order of precedence:</p>
+<ul>
+<li>
+<p>
+Patterns read from the file specified by the configuration
+   variable <em>core.excludesfile</em>.
+</p>
+</li>
+<li>
+<p>
+Patterns read from <tt>$GIT_DIR/info/exclude</tt>.
+</p>
+</li>
+<li>
+<p>
+Patterns read from a <tt>.gitignore</tt> file in the same directory
+   as the path, or in any parent directory, ordered from the
+   deepest such file to a file in the root of the repository.
+   These patterns match relative to the location of the
+   <tt>.gitignore</tt> file.  A project normally includes such
+   <tt>.gitignore</tt> files in its repository, containing patterns for
+   files generated as part of the project build.
+</p>
+</li>
+</ul>
+<p>The underlying git plumbing tools, such as
+<a href="git-ls-files.html">git-ls-files(1)</a> and <a href="git-read-tree.html">git-read-tree(1)</a>, read
+<tt>gitignore</tt> patterns specified by command-line options, or from
+files specified by command-line options.  Higher-level git
+tools, such as <a href="git-status.html">git-status(1)</a> and <a href="git-add.html">git-add(1)</a>,
+use patterns from the sources specified above.</p>
+<p>Patterns have the following format:</p>
+<ul>
+<li>
+<p>
+A blank line matches no files, so it can serve as a separator
+   for readability.
+</p>
+</li>
+<li>
+<p>
+A line starting with # serves as a comment.
+</p>
+</li>
+<li>
+<p>
+An optional prefix <em>!</em> which negates the pattern; any
+   matching file excluded by a previous pattern will become
+   included again.
+</p>
+</li>
+<li>
+<p>
+If the pattern does not contain a slash <em>/</em>, git treats it as
+   a shell glob pattern and checks for a match against the
+   pathname without leading directories.
+</p>
+</li>
+<li>
+<p>
+Otherwise, git treats the pattern as a shell glob suitable
+   for consumption by fnmatch(3) with the FNM_PATHNAME flag:
+   wildcards in the pattern will not match a / in the pathname.
+   For example, "Documentation/*.html" matches
+   "Documentation/git.html" but not
+   "Documentation/ppc/ppc.html".  A leading slash matches the
+   beginning of the pathname; for example, "/*.c" matches
+   "cat-file.c" but not "mozilla-sha1/sha1.c".
+</p>
+</li>
+</ul>
+<p>An example:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>    $ git-status
+    [...]
+    # Untracked files:
+    [...]
+    #       Documentation/foo.html
+    #       Documentation/gitignore.html
+    #       file.o
+    #       lib.a
+    #       src/internal.o
+    [...]
+    $ cat .git/info/exclude
+    # ignore objects and archives, anywhere in the tree.
+    *.[oa]
+    $ cat Documentation/.gitignore
+    # ignore generated html files,
+    *.html
+    # except foo.html which is maintained by hand
+    !foo.html
+    $ git-status
+    [...]
+    # Untracked files:
+    [...]
+    #       Documentation/foo.html
+    [...]</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 prevents git from ignoring
+<tt>arch/foo/kernel/vmlinux.lds.S</tt>.</p>
+</div>
+<h2>Documentation</h2>
+<div class="sectionbody">
+<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett,
+Frank Lichtenheld, and the git-list &lt;git@vger.kernel.org&gt;.</p>
+</div>
+<h2>GIT</h2>
+<div class="sectionbody">
+<p>Part of the <a href="git.html">git(7)</a> suite</p>
+</div>
+<div id="footer">
+<div id="footer-text">
+Last updated 02-Jun-2007 21:10:18 UTC
+</div>
+</div>
+</body>
+</html>
diff --git a/gitignore.txt b/gitignore.txt
new file mode 100644
index 000000000..ea79d74b8
--- /dev/null
+++ b/gitignore.txt
@@ -0,0 +1,116 @@
+gitignore(5)
+============
+
+NAME
+----
+gitignore - Specifies intentionally untracked files to ignore
+
+SYNOPSIS
+--------
+$GIT_DIR/info/exclude, .gitignore
+
+DESCRIPTION
+-----------
+
+A `gitignore` file specifies intentionally untracked files that
+git should ignore.  Each line in a `gitignore` file specifies a
+pattern.
+
+When deciding whether to ignore a path, git normally checks
+`gitignore` patterns from multiple sources, with the following
+order of precedence:
+
+ * Patterns read from the file specified by the configuration
+   variable 'core.excludesfile'.
+
+ * Patterns read from `$GIT_DIR/info/exclude`.
+
+ * Patterns read from a `.gitignore` file in the same directory
+   as the path, or in any parent directory, ordered from the
+   deepest such file to a file in the root of the repository.
+   These patterns match relative to the location of the
+   `.gitignore` file.  A project normally includes such
+   `.gitignore` files in its repository, containing patterns for
+   files generated as part of the project build.
+
+The underlying git plumbing tools, such as
+gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read
+`gitignore` patterns specified by command-line options, or from
+files specified by command-line options.  Higher-level git
+tools, such as gitlink:git-status[1] and gitlink:git-add[1],
+use patterns from the sources specified above.
+
+Patterns have the following format:
+
+ - A blank line matches no files, so it can serve as a separator
+   for readability.
+
+ - A line starting with # serves as a comment.
+
+ - An optional prefix '!' which negates the pattern; any
+   matching file excluded by a previous pattern will become
+   included again.
+
+ - If the pattern does not contain a slash '/', git treats it as
+   a shell glob pattern and checks for a match against the
+   pathname without leading directories.
+
+ - Otherwise, git treats the pattern as a shell glob suitable
+   for consumption by fnmatch(3) with the FNM_PATHNAME flag:
+   wildcards in the pattern will not match a / in the pathname.
+   For example, "Documentation/\*.html" matches
+   "Documentation/git.html" but not
+   "Documentation/ppc/ppc.html".  A leading slash matches the
+   beginning of the pathname; for example, "/*.c" matches
+   "cat-file.c" but not "mozilla-sha1/sha1.c".
+
+An example:
+
+--------------------------------------------------------------
+    $ git-status
+    [...]
+    # Untracked files:
+    [...]
+    #       Documentation/foo.html
+    #       Documentation/gitignore.html
+    #       file.o
+    #       lib.a
+    #       src/internal.o
+    [...]
+    $ cat .git/info/exclude
+    # ignore objects and archives, anywhere in the tree.
+    *.[oa]
+    $ cat Documentation/.gitignore
+    # ignore generated html files,
+    *.html
+    # except foo.html which is maintained by hand
+    !foo.html
+    $ git-status
+    [...]
+    # Untracked files:
+    [...]
+    #       Documentation/foo.html
+    [...]
+--------------------------------------------------------------
+
+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 prevents git from ignoring
+`arch/foo/kernel/vmlinux.lds.S`.
+
+Documentation
+-------------
+Documentation by David Greaves, Junio C Hamano, Josh Triplett,
+Frank Lichtenheld, and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
diff --git a/gitk.html b/gitk.html
index b98260f0f..72241c141 100644
--- a/gitk.html
+++ b/gitk.html
@@ -425,7 +425,7 @@ gitk --max-count=100 --all &#8212; Makefile
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:38 UTC
+Last updated 02-Jun-2007 21:10:17 UTC
 </div>
 </div>
 </body>
diff --git a/glossary.html b/glossary.html
index 970458b15..9faac4992 100644
--- a/glossary.html
+++ b/glossary.html
@@ -1069,7 +1069,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-May-2007 04:28:37 UTC
+Last updated 02-Jun-2007 21:10:22 UTC
 </div>
 </div>
 </body>
diff --git a/hooks.html b/hooks.html
index 9ddbedd74..2f910a9e3 100644
--- a/hooks.html
+++ b/hooks.html
@@ -459,7 +459,7 @@ for the user.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 13-May-2007 22:18:55 UTC
+Last updated 02-Jun-2007 21:10:22 UTC
 </div>
 </div>
 </body>
diff --git a/howto-index.html b/howto-index.html
index 5a6d48cd5..a15d10b39 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -380,7 +380,7 @@ as a Linux subsystem maintainer.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:44 UTC
+Last updated 02-Jun-2007 21:10:21 UTC
 </div>
 </div>
 </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index ab77e21d8..938189f3f 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -434,7 +434,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:48 UTC
+Last updated 02-Jun-2007 21:10:23 UTC
 </div>
 </div>
 </body>
diff --git a/repository-layout.html b/repository-layout.html
index f85d6f03d..5d03f2086 100644
--- a/repository-layout.html
+++ b/repository-layout.html
@@ -528,8 +528,7 @@ info/exclude
         exclude pattern list. <tt>.gitignore</tt> is the per-directory
         ignore file.  <tt>git status</tt>, <tt>git add</tt>, <tt>git rm</tt> and <tt>git
         clean</tt> look at it but the core git commands do not look
-        at it.  See also: <a href="git-ls-files.html">git-ls-files(1)</a> <tt>&#8212;exclude-from</tt>
-        and <tt>&#8212;exclude-per-directory</tt>.
+        at it.  See also: <a href="gitignore.html">gitignore(5)</a>.
 </p>
 </dd>
 <dt>
@@ -583,7 +582,7 @@ shallow
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:45 UTC
+Last updated 02-Jun-2007 21:10:21 UTC
 </div>
 </div>
 </body>
diff --git a/repository-layout.txt b/repository-layout.txt
index 0459bd9ca..15221b532 100644
--- a/repository-layout.txt
+++ b/repository-layout.txt
@@ -155,8 +155,7 @@ info/exclude::
 	exclude pattern list. `.gitignore` is the per-directory
 	ignore file.  `git status`, `git add`, `git rm` and `git
 	clean` look at it but the core git commands do not look
-	at it.  See also: gitlink:git-ls-files[1] `--exclude-from`
-	and `--exclude-per-directory`.
+	at it.  See also: gitlink:gitignore[5].
 
 remotes::
 	Stores shorthands to be used to give URL and default
diff --git a/tutorial-2.html b/tutorial-2.html
index 230173330..b7719ae32 100644
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -647,7 +647,7 @@ example, creating a new commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-May-2007 09:08:18 UTC
+Last updated 02-Jun-2007 21:10:19 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial.html b/tutorial.html
index 064de68a2..d3d693807 100644
--- a/tutorial.html
+++ b/tutorial.html
@@ -786,7 +786,7 @@ digressions that may be interesting at this point are:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-May-2007 09:08:17 UTC
+Last updated 02-Jun-2007 21:10:18 UTC
 </div>
 </div>
 </body>
diff --git a/user-manual.html b/user-manual.html
index 97d16126a..a17980de8 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -441,12 +441,12 @@ annoying to have these untracked files lying around; e.g. they make
 "<code class="literal">git add .</code>" and "<code class="literal">git commit -a</code>" practically useless, and they keep
 showing up in the output of "<code class="literal">git status</code>", etc.</p><p>Git therefore provides "exclude patterns" for telling git which files to
 actively ignore. Exclude patterns are thoroughly explained in the
-"Exclude Patterns" section of the <a href="git-ls-files.html" target="_top">git-ls-files(1)</a> manual page,
-but the heart of the concept is simply a list of files which git should
-ignore. Entries in the list may contain globs to specify multiple files,
-or may be prefixed by "<code class="literal">!</code>" to explicitly include (un-ignore) a previously
-excluded (ignored) file (i.e. later exclude patterns override earlier ones).
-The following example should illustrate such patterns:</p><div class="literallayout"><p># Lines starting with '#' are considered comments.<br>
+<a href="gitignore.html" target="_top">gitignore(5)</a> manual page, but the heart of the concept is simply
+a list of files which git should ignore. Entries in the list may contain
+globs to specify multiple files, or may be prefixed by "<code class="literal">!</code>" to
+explicitly include (un-ignore) a previously excluded (ignored) file
+(i.e. later exclude patterns override earlier ones).  The following
+example should illustrate such patterns:</p><div class="literallayout"><p># Lines starting with '#' are considered comments.<br>
 # Ignore foo.txt.<br>
 foo.txt<br>
 # Ignore (generated) html files,<br>
diff --git a/user-manual.txt b/user-manual.txt
index 4fabb8e2a..7eaafa80e 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1103,12 +1103,12 @@ showing up in the output of "`git status`", etc.
 
 Git therefore provides "exclude patterns" for telling git which files to
 actively ignore. Exclude patterns are thoroughly explained in the
-"Exclude Patterns" section of the gitlink:git-ls-files[1] manual page,
-but the heart of the concept is simply a list of files which git should
-ignore. Entries in the list may contain globs to specify multiple files,
-or may be prefixed by "`!`" to explicitly include (un-ignore) a previously
-excluded (ignored) file (i.e. later exclude patterns override earlier ones).
-The following example should illustrate such patterns:
+gitlink:gitignore[5] manual page, but the heart of the concept is simply
+a list of files which git should ignore. Entries in the list may contain
+globs to specify multiple files, or may be prefixed by "`!`" to
+explicitly include (un-ignore) a previously excluded (ignored) file
+(i.e. later exclude patterns override earlier ones).  The following
+example should illustrate such patterns:
 
 -------------------------------------------------
 # Lines starting with '#' are considered comments.
-- 
2.26.2