From: Junio C Hamano <junio@hera.kernel.org>
Date: Sat, 2 Jun 2007 21:13:50 +0000 (+0000)
Subject: Autogenerated manpages for v1.5.2-167-g4bc70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60473351dace62b517b3c1b5dd0a1e8c281eaebd;p=git.git

Autogenerated manpages for v1.5.2-167-g4bc70
---

diff --git a/man1/git-add.1 b/man1/git-add.1
index bccba2a15..8d8c16f69 100644
--- a/man1/git-add.1
+++ b/man1/git-add.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-ADD" "1" "05/18/2007" "Git 1.5.2.rc3.61.g4229" "Git Manual"
+.TH "GIT\-ADD" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-am.1 b/man1/git-am.1
index 28a0efb57..a037e2880 100644
--- a/man1/git-am.1
+++ b/man1/git-am.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-AM" "1" "05/25/2007" "Git 1.5.2.73.g18bece" "Git Manual"
+.TH "GIT\-AM" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -16,8 +16,8 @@ git\-am \- Apply a series of patches from a mailbox
          [\-\-3way] [\-\-interactive] [\-\-binary]
          [\-\-whitespace=<option>] [\-C<n>] [\-p<n>]
          <mbox>|<Maildir>\&...
-.fi
 \fIgit\-am\fR [\-\-skip | \-\-resolved]
+.fi
 .SH "DESCRIPTION"
 Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch.
 .SH "OPTIONS"
diff --git a/man1/git-annotate.1 b/man1/git-annotate.1
index ee6880755..66b5d0f25 100644
--- a/man1/git-annotate.1
+++ b/man1/git-annotate.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-ANNOTATE" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-ANNOTATE" "1" "06/02/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-apply.1 b/man1/git-apply.1
index 21a684a95..96e1452af 100644
--- a/man1/git-apply.1
+++ b/man1/git-apply.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLY" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-APPLY" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-applymbox.1 b/man1/git-applymbox.1
index f0fda2c9e..fd7cd69eb 100644
--- a/man1/git-applymbox.1
+++ b/man1/git-applymbox.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLYMBOX" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-APPLYMBOX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-applypatch.1 b/man1/git-applypatch.1
index 5b8f3b237..68b74a6ef 100644
--- a/man1/git-applypatch.1
+++ b/man1/git-applypatch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLYPATCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-APPLYPATCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-archimport.1 b/man1/git-archimport.1
index 37fcc115d..b25d5103b 100644
--- a/man1/git-archimport.1
+++ b/man1/git-archimport.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-ARCHIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-ARCHIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-archive.1 b/man1/git-archive.1
index 4d7ac18d8..0bf9d1247 100644
--- a/man1/git-archive.1
+++ b/man1/git-archive.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-ARCHIVE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-ARCHIVE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-bisect.1 b/man1/git-bisect.1
index a8c8247c8..16528c1c2 100644
--- a/man1/git-bisect.1
+++ b/man1/git-bisect.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BISECT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-BISECT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-blame.1 b/man1/git-blame.1
index 157f4749d..aa9417467 100644
--- a/man1/git-blame.1
+++ b/man1/git-blame.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BLAME" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-BLAME" "1" "06/02/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-branch.1 b/man1/git-branch.1
index 3c4e5256c..9fa528924 100644
--- a/man1/git-branch.1
+++ b/man1/git-branch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BRANCH" "1" "05/16/2007" "Git 1.5.2.rc3.50.gfdcb7" "Git Manual"
+.TH "GIT\-BRANCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-bundle.1 b/man1/git-bundle.1
index 028d07e22..5c8de7229 100644
--- a/man1/git-bundle.1
+++ b/man1/git-bundle.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BUNDLE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-BUNDLE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1
index 59bebb923..f9223b802 100644
--- a/man1/git-cat-file.1
+++ b/man1/git-cat-file.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CAT\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CAT\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1
index dbb503b83..7435b1604 100644
--- a/man1/git-check-attr.1
+++ b/man1/git-check-attr.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECK\-ATTR" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECK\-ATTR" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1
index c491bcfa1..d5a9b14c7 100644
--- a/man1/git-check-ref-format.1
+++ b/man1/git-check-ref-format.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECK\-REF\-FORMAT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECK\-REF\-FORMAT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1
index 7e7cf7087..cc894f950 100644
--- a/man1/git-checkout-index.1
+++ b/man1/git-checkout-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECKOUT\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECKOUT\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-checkout.1 b/man1/git-checkout.1
index 46f55827a..3beba64b6 100644
--- a/man1/git-checkout.1
+++ b/man1/git-checkout.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECKOUT" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual"
+.TH "GIT\-CHECKOUT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1
index d6ceb3499..51648e38e 100644
--- a/man1/git-cherry-pick.1
+++ b/man1/git-cherry-pick.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHERRY\-PICK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHERRY\-PICK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cherry.1 b/man1/git-cherry.1
index 727ff3fb5..a75d025a6 100644
--- a/man1/git-cherry.1
+++ b/man1/git-cherry.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHERRY" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHERRY" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-clean.1 b/man1/git-clean.1
index e64a38bd3..17a7db23f 100644
--- a/man1/git-clean.1
+++ b/man1/git-clean.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CLEAN" "1" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual"
+.TH "GIT\-CLEAN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-clone.1 b/man1/git-clone.1
index 76ccbb54e..3bcdc441c 100644
--- a/man1/git-clone.1
+++ b/man1/git-clone.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CLONE" "1" "05/12/2007" "Git 1.5.2.rc3.14.g6671" "Git Manual"
+.TH "GIT\-CLONE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1
index 01144a94c..f0a06b542 100644
--- a/man1/git-commit-tree.1
+++ b/man1/git-commit-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-COMMIT\-TREE" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-COMMIT\-TREE" "1" "06/02/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-commit.1 b/man1/git-commit.1
index 680ece77e..44f0a0c7e 100644
--- a/man1/git-commit.1
+++ b/man1/git-commit.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-COMMIT" "1" "04/22/2007" "" ""
+.TH "GIT\-COMMIT" "1" "06/02/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-config.1 b/man1/git-config.1
index 602d9f78e..8250f10ab 100644
--- a/man1/git-config.1
+++ b/man1/git-config.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONFIG" "1" "05/31/2007" "Git 1.5.2.146.gb75c6" "Git Manual"
+.TH "GIT\-CONFIG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -358,7 +358,7 @@ Default is 16 MiB on all platforms. This should be reasonable for all users/oper
 Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported.
 .TP
 core.excludeFile
-In addition to \fI.gitignore\fR (per\-directory) and \fI.git/info/exclude\fR, git looks into this file for patterns of files which are not meant to be tracked.
+In addition to \fI.gitignore\fR (per\-directory) and \fI.git/info/exclude\fR, git looks into this file for patterns of files which are not meant to be tracked. See \fBgitignore\fR(5).
 .TP
 alias.*
 Command aliases for the \fBgit\fR(1) command wrapper \- e.g. after defining "alias.last = cat\-file commit HEAD", the invocation "git last" is equivalent to "git cat\-file commit HEAD". To avoid confusion and troubles with script usage, aliases that hide existing git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them.
@@ -522,6 +522,12 @@ The maximum delta depth used by \fBgit\-pack\-objects\fR(1) when no maximum dept
 pack.compression
 An integer \-1..9, indicating the compression level for objects in a pack file. \-1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to \-1.
 .TP
+pack.deltaCacheSize
+The maxium memory in bytes used for caching deltas in \fBgit\-pack\-objects\fR(1). A value of 0 means no limit. Defaults to 0.
+.TP
+pack.deltaCacheLimit
+The maxium size of a delta, that is cached in \fBgit\-pack\-objects\fR(1). Defaults to 1000.
+.TP
 pull.octopus
 The default merge strategy to use when pulling multiple branches at once.
 .TP
diff --git a/man1/git-convert-objects.1 b/man1/git-convert-objects.1
index 08a0776f1..b7cce8502 100644
--- a/man1/git-convert-objects.1
+++ b/man1/git-convert-objects.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONVERT\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CONVERT\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1
index db021e1a8..24e0b8bdf 100644
--- a/man1/git-count-objects.1
+++ b/man1/git-count-objects.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-COUNT\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-COUNT\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1
index 37db18246..8b14c6972 100644
--- a/man1/git-cvsexportcommit.1
+++ b/man1/git-cvsexportcommit.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CVSEXPORTCOMMIT" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-CVSEXPORTCOMMIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index bf068e6fc..9a8e3884d 100644
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CVSIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CVSIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1
index 9b906b299..461a1f06d 100644
--- a/man1/git-cvsserver.1
+++ b/man1/git-cvsserver.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CVSSERVER" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-CVSSERVER" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-daemon.1 b/man1/git-daemon.1
index d66dcc117..d559dab10 100644
--- a/man1/git-daemon.1
+++ b/man1/git-daemon.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DAEMON" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-DAEMON" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-describe.1 b/man1/git-describe.1
index 25abf2f9f..f05ea1d34 100644
--- a/man1/git-describe.1
+++ b/man1/git-describe.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DESCRIBE" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-DESCRIBE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index 90a897dfa..2c8ea93e5 100644
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-FILES" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-DIFF\-FILES" "1" "06/02/2007" "Git 1.5.2.rc2" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index c798b633c..1e59aec94 100644
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-INDEX" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-DIFF\-INDEX" "1" "06/02/2007" "Git 1.5.2.rc2" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index edf14cc6a..6698525b0 100644
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-TREE" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-DIFF\-TREE" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-diff.1 b/man1/git-diff.1
index 0643bf455..90f67d296 100644
--- a/man1/git-diff.1
+++ b/man1/git-diff.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF" "1" "04/22/2007" "" ""
+.TH "GIT\-DIFF" "1" "06/02/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1
index 77c52d7a4..a20d2247d 100644
--- a/man1/git-fast-import.1
+++ b/man1/git-fast-import.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FAST\-IMPORT" "1" "05/10/2007" "Git 1.5.2.rc3" "Git Manual"
+.TH "GIT\-FAST\-IMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1
index d95d1fdb1..bd17956a2 100644
--- a/man1/git-fetch-pack.1
+++ b/man1/git-fetch-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FETCH\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FETCH\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fetch.1 b/man1/git-fetch.1
index 69baab418..16016f56a 100644
--- a/man1/git-fetch.1
+++ b/man1/git-fetch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-FETCH" "1" "06/02/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1
index 9a26a5d69..a52990363 100644
--- a/man1/git-fmt-merge-msg.1
+++ b/man1/git-fmt-merge-msg.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FMT\-MERGE\-MSG" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-FMT\-MERGE\-MSG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1
index 51cf70bad..75ca7e30f 100644
--- a/man1/git-for-each-ref.1
+++ b/man1/git-for-each-ref.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FOR\-EACH\-REF" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-FOR\-EACH\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1
index 368e8c41f..503d8b05c 100644
--- a/man1/git-format-patch.1
+++ b/man1/git-format-patch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FORMAT\-PATCH" "1" "04/22/2007" "Git 1.5.1.1.81.g6aea" "Git Manual"
+.TH "GIT\-FORMAT\-PATCH" "1" "06/02/2007" "Git 1.5.1.1.81.g6aea" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1
index b4e043e75..e60aa44e4 100644
--- a/man1/git-fsck-objects.1
+++ b/man1/git-fsck-objects.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FSCK\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FSCK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-fsck.1 b/man1/git-fsck.1
index cb09c08fb..8f8d9a3f9 100644
--- a/man1/git-fsck.1
+++ b/man1/git-fsck.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FSCK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FSCK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-gc.1 b/man1/git-gc.1
index 27c07ce1f..c48174a72 100644
--- a/man1/git-gc.1
+++ b/man1/git-gc.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-GC" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual"
+.TH "GIT\-GC" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -21,7 +21,7 @@ Users are encouraged to run this task on a regular basis within each repository
 Usually git\-gc packs refs, expires old reflog entries, packs loose objects, and removes old \fIrerere\fR records. Removal of unreferenced loose objects is an unsafe operation while other git operations are in progress, so it is not done by default. Pass this option if you want it, and only when you know nobody else is creating new objects in the repository at the same time (e.g. never use this option in a cron script).
 .TP
 \-\-aggressive
-Usually \fIgit\-gc\fR 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 of taking much more time. The effects of this optimization are persistent, so this option only needs to be sporadically; every few hundred changesets or so.
+Usually \fIgit\-gc\fR runs very quickly while providing good disk 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 used occasionally; every few hundred changesets or so.
 .SH "CONFIGURATION"
 The optional configuration variable \fIgc.reflogExpire\fR can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example \fI90 days\fR or \fI3 months\fR. It defaults to \fI90 days\fR.
 
diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1
index 597bd4872..d4c159ffb 100644
--- a/man1/git-get-tar-commit-id.1
+++ b/man1/git-get-tar-commit-id.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-GET\-TAR\-COMMIT\-I" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-GET\-TAR\-COMMIT\-I" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-grep.1 b/man1/git-grep.1
index 3493d1eac..e2df55ffe 100644
--- a/man1/git-grep.1
+++ b/man1/git-grep.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-GREP" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-GREP" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1
index 570f77051..2236ec641 100644
--- a/man1/git-hash-object.1
+++ b/man1/git-hash-object.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-HASH\-OBJECT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-HASH\-OBJECT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1
index be79231fb..81d789dc7 100644
--- a/man1/git-http-fetch.1
+++ b/man1/git-http-fetch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-HTTP\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-HTTP\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-http-push.1 b/man1/git-http-push.1
index 3d54b2e34..92ee9fbe2 100644
--- a/man1/git-http-push.1
+++ b/man1/git-http-push.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-HTTP\-PUSH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-HTTP\-PUSH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1
index dd8332643..42ab78c07 100644
--- a/man1/git-imap-send.1
+++ b/man1/git-imap-send.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-IMAP\-SEND" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-IMAP\-SEND" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1
index ca7b0672e..33cecb80b 100644
--- a/man1/git-index-pack.1
+++ b/man1/git-index-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-INDEX\-PACK" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-INDEX\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-init-db.1 b/man1/git-init-db.1
index 88a3f407e..7905af790 100644
--- a/man1/git-init-db.1
+++ b/man1/git-init-db.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-INIT\-DB" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-INIT\-DB" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-init.1 b/man1/git-init.1
index 6033e6ef9..958a55fc9 100644
--- a/man1/git-init.1
+++ b/man1/git-init.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-INIT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-INIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1
index 696a4c8fb..7769c0a74 100644
--- a/man1/git-instaweb.1
+++ b/man1/git-instaweb.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-INSTAWEB" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-INSTAWEB" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-local-fetch.1 b/man1/git-local-fetch.1
index 16eed495d..126e28a0a 100644
--- a/man1/git-local-fetch.1
+++ b/man1/git-local-fetch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LOCAL\-FETCH" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-LOCAL\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-log.1 b/man1/git-log.1
index 043770ef1..b28b444ac 100644
--- a/man1/git-log.1
+++ b/man1/git-log.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LOG" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-LOG" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-lost-found.1 b/man1/git-lost-found.1
index ea422d64a..873d6b6a1 100644
--- a/man1/git-lost-found.1
+++ b/man1/git-lost-found.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LOST\-FOUND" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LOST\-FOUND" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1
index f225c52b4..87ff5adc8 100644
--- a/man1/git-ls-files.1
+++ b/man1/git-ls-files.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LS\-FILES" "1" "05/27/2007" "Git 1.5.2.86.g99b5" "Git Manual"
+.TH "GIT\-LS\-FILES" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -137,79 +137,26 @@ For an unmerged path, instead of recording a single mode/SHA1 pair, the index re
 
 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
 .SH "EXCLUDE PATTERNS"
-\fIgit\-ls\-files\fR 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.
+\fIgit\-ls\-files\fR 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. \fBgitignore\fR(5) specifies the format of exclude patterns.
 
-These exclude patterns come from these places:
+These exclude patterns come from these places, in order:
 .TP 3
 1.
-command line flag \-\-exclude=<pattern> specifies a single pattern.
+The command line flag \-\-exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line.
 .TP
 2.
-command line flag \-\-exclude\-from=<file> specifies a list of patterns stored in a file.
+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.
 .TP
 3.
-command line flag \-\-exclude\-per\-directory=<name> specifies a name of the file in each directory \fIgit\-ls\-files\fR 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 \fI#\fR 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:
-.TP 3
-\(bu
-\-\-exclude=<pattern> from the command line; patterns are ordered in the same order as they appear on the command line.
-.TP
-\(bu
-lines read from \-\-exclude\-from=<file>; patterns are ordered in the same order as they appear in the file.
-.TP
-\(bu
-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".
+command line flag \-\-exclude\-per\-directory=<name> specifies a name of the file in each directory \fIgit\-ls\-files\fR 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 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:
-.TP 3
-\(bu
-an optional prefix \fI!\fR 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.
-.TP
-\(bu
-if it does not contain a slash \fI/\fR, it is a shell glob pattern and used to match against the filename without leading directories.
-.TP
-\(bu
-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:
-.sp
-.nf
-    $ 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
-.fi
-Another example:
-.sp
-.nf
-    $ cat .gitignore
-    vmlinux*
-    $ ls arch/foo/kernel/vm*
-    arch/foo/kernel/vmlinux.lds.S
-    $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
-.fi
-The second .gitignore keeps arch/foo/kernel/vmlinux.lds.S file from getting ignored.
 .SH "SEE ALSO"
-\fBgit\-read\-tree\fR(1)
+\fBgit\-read\-tree\fR(1), \fBgitignore\fR(5)
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org>
 .SH "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>.
 .SH "GIT"
 Part of the \fBgit\fR(7) suite
 
diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1
index 5684a29aa..e3e12800b 100644
--- a/man1/git-ls-remote.1
+++ b/man1/git-ls-remote.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LS\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LS\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1
index 61aa434b0..06564bd7e 100644
--- a/man1/git-ls-tree.1
+++ b/man1/git-ls-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LS\-TREE" "1" "05/23/2007" "Git 1.5.2.45.ged82" "Git Manual"
+.TH "GIT\-LS\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1
index 040f4fdbb..4e4712820 100644
--- a/man1/git-mailinfo.1
+++ b/man1/git-mailinfo.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MAILINFO" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-MAILINFO" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1
index 9a97a71f3..c81295c4f 100644
--- a/man1/git-mailsplit.1
+++ b/man1/git-mailsplit.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MAILSPLIT" "1" "05/25/2007" "Git 1.5.2.73.g18bece" "Git Manual"
+.TH "GIT\-MAILSPLIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1
index 1c3384f4e..18201be49 100644
--- a/man1/git-merge-base.1
+++ b/man1/git-merge-base.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE\-BASE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-BASE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1
index a58774dad..274c56273 100644
--- a/man1/git-merge-file.1
+++ b/man1/git-merge-file.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1
index 5b9a5c265..09039d050 100644
--- a/man1/git-merge-index.1
+++ b/man1/git-merge-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1
index 84dacc32a..5da1209ad 100644
--- a/man1/git-merge-one-file.1
+++ b/man1/git-merge-one-file.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE\-ONE\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-ONE\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1
index d514fa4f9..552949b34 100644
--- a/man1/git-merge-tree.1
+++ b/man1/git-merge-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-merge.1 b/man1/git-merge.1
index 5f2d86280..ca2abdbf9 100644
--- a/man1/git-merge.1
+++ b/man1/git-merge.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-MERGE" "1" "06/02/2007" "Git 1.5.2.136.g322bc" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1
index bfea90d7f..e72fa5a16 100644
--- a/man1/git-mergetool.1
+++ b/man1/git-mergetool.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGETOOL" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
+.TH "GIT\-MERGETOOL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mktag.1 b/man1/git-mktag.1
index b2ee683ee..f58922b54 100644
--- a/man1/git-mktag.1
+++ b/man1/git-mktag.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MKTAG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MKTAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mktree.1 b/man1/git-mktree.1
index d88f91811..c62cd6d81 100644
--- a/man1/git-mktree.1
+++ b/man1/git-mktree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MKTREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MKTREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-mv.1 b/man1/git-mv.1
index 45de14c7d..7b7943eba 100644
--- a/man1/git-mv.1
+++ b/man1/git-mv.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MV" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MV" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1
index f0bb241f2..80fb4bfd0 100644
--- a/man1/git-name-rev.1
+++ b/man1/git-name-rev.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-NAME\-REV" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-NAME\-REV" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-p4import.1 b/man1/git-p4import.1
index 65b592c38..2a795eae8 100644
--- a/man1/git-p4import.1
+++ b/man1/git-p4import.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-P4IMPORT" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-P4IMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1
index fec87c0d8..4d5cc73f4 100644
--- a/man1/git-pack-objects.1
+++ b/man1/git-pack-objects.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PACK\-OBJECTS" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-PACK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1
index c2214dc1b..50ae6e187 100644
--- a/man1/git-pack-redundant.1
+++ b/man1/git-pack-redundant.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PACK\-REDUNDANT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PACK\-REDUNDANT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1
index 7a6721798..7c26dbb09 100644
--- a/man1/git-pack-refs.1
+++ b/man1/git-pack-refs.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PACK\-REFS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PACK\-REFS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-parse-remote.1 b/man1/git-parse-remote.1
index f975cc8fd..e42986ee8 100644
--- a/man1/git-parse-remote.1
+++ b/man1/git-parse-remote.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PARSE\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PARSE\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1
index dd76cbcc3..774eae14c 100644
--- a/man1/git-patch-id.1
+++ b/man1/git-patch-id.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PATCH\-ID" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PATCH\-ID" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-peek-remote.1 b/man1/git-peek-remote.1
index 0c56de974..d60c52fa5 100644
--- a/man1/git-peek-remote.1
+++ b/man1/git-peek-remote.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PEEK\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PEEK\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1
index ec08a58e4..25b49f214 100644
--- a/man1/git-prune-packed.1
+++ b/man1/git-prune-packed.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PRUNE\-PACKED" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PRUNE\-PACKED" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-prune.1 b/man1/git-prune.1
index cb60ee461..5aae7c9bf 100644
--- a/man1/git-prune.1
+++ b/man1/git-prune.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PRUNE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PRUNE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-pull.1 b/man1/git-pull.1
index c05d3e465..99bd07f73 100644
--- a/man1/git-pull.1
+++ b/man1/git-pull.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PULL" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-PULL" "1" "06/02/2007" "Git 1.5.2.136.g322bc" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-push.1 b/man1/git-push.1
index a05c8658f..e99713edb 100644
--- a/man1/git-push.1
+++ b/man1/git-push.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PUSH" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-PUSH" "1" "06/02/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1
index 4198d4f01..c5afcb5d0 100644
--- a/man1/git-quiltimport.1
+++ b/man1/git-quiltimport.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-QUILTIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-QUILTIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1
index 565d7dc63..3c9822048 100644
--- a/man1/git-read-tree.1
+++ b/man1/git-read-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-READ\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-READ\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -205,7 +205,7 @@ However, if you have local changes in the working tree that would be overwritten
 
 In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they \fBdo\fR interfere, the merge does not even start (git\-read\-tree complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work\-in\-progress), attempt the merge again.
 .SH "SEE ALSO"
-\fBgit\-write\-tree\fR(1); \fBgit\-ls\-files\fR(1)
+\fBgit\-write\-tree\fR(1); \fBgit\-ls\-files\fR(1); \fBgitignore\fR(5)
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org>
 .SH "DOCUMENTATION"
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index a1037c621..7ba2fe065 100644
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REBASE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-REBASE" "1" "06/02/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1
index 405a3aa17..691174e08 100644
--- a/man1/git-receive-pack.1
+++ b/man1/git-receive-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RECEIVE\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RECEIVE\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-reflog.1 b/man1/git-reflog.1
index d45d1b8cb..dcc399043 100644
--- a/man1/git-reflog.1
+++ b/man1/git-reflog.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REFLOG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REFLOG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-relink.1 b/man1/git-relink.1
index 1edf6be9c..a9f433ab2 100644
--- a/man1/git-relink.1
+++ b/man1/git-relink.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RELINK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RELINK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-remote.1 b/man1/git-remote.1
index 8b7951efc..e2948269c 100644
--- a/man1/git-remote.1
+++ b/man1/git-remote.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REMOTE" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-repack.1 b/man1/git-repack.1
index c6fd92aaf..60261ec3b 100644
--- a/man1/git-repack.1
+++ b/man1/git-repack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REPACK" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-REPACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index a63e98205..403789ba4 100644
--- a/man1/git-repo-config.1
+++ b/man1/git-repo-config.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REPO\-CONFIG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REPO\-CONFIG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1
index aa98d21eb..8f3620dcb 100644
--- a/man1/git-request-pull.1
+++ b/man1/git-request-pull.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REQUEST\-PULL" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REQUEST\-PULL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-rerere.1 b/man1/git-rerere.1
index df21213cf..5b15ec9ea 100644
--- a/man1/git-rerere.1
+++ b/man1/git-rerere.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RERERE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RERERE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-reset.1 b/man1/git-reset.1
index c4730cee9..6184bee24 100644
--- a/man1/git-reset.1
+++ b/man1/git-reset.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RESET" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual"
+.TH "GIT\-RESET" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1
index 9002ab5ac..075f67c28 100644
--- a/man1/git-rev-list.1
+++ b/man1/git-rev-list.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REV\-LIST" "1" "05/21/2007" "Git 1.5.2.24.g93d4" "Git Manual"
+.TH "GIT\-REV\-LIST" "1" "06/02/2007" "Git 1.5.2.24.g93d4" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1
index 66efbcbbc..81f2c059c 100644
--- a/man1/git-rev-parse.1
+++ b/man1/git-rev-parse.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REV\-PARSE" "1" "05/10/2007" "Git 1.5.2.rc3" "Git Manual"
+.TH "GIT\-REV\-PARSE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-revert.1 b/man1/git-revert.1
index d2a20d271..5353f2cdb 100644
--- a/man1/git-revert.1
+++ b/man1/git-revert.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REVERT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REVERT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-rm.1 b/man1/git-rm.1
index 450444beb..180fe2364 100644
--- a/man1/git-rm.1
+++ b/man1/git-rm.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RM" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RM" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-runstatus.1 b/man1/git-runstatus.1
index 3a20e8f01..5b1f271ec 100644
--- a/man1/git-runstatus.1
+++ b/man1/git-runstatus.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RUNSTATUS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RUNSTATUS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-send-email.1 b/man1/git-send-email.1
index b1dc73ee4..6fe0217eb 100644
--- a/man1/git-send-email.1
+++ b/man1/git-send-email.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SEND\-EMAIL" "1" "05/01/2007" "Git 1.5.2.rc1" "Git Manual"
+.TH "GIT\-SEND\-EMAIL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1
index 7d9dd91eb..7174ce591 100644
--- a/man1/git-send-pack.1
+++ b/man1/git-send-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SEND\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SEND\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1
index 26e1e0c4c..19506ce5a 100644
--- a/man1/git-sh-setup.1
+++ b/man1/git-sh-setup.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SH\-SETUP" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SH\-SETUP" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-shell.1 b/man1/git-shell.1
index bcffc6697..2ebaa9419 100644
--- a/man1/git-shell.1
+++ b/man1/git-shell.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHELL" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHELL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1
index 02a841ba0..e402a25ce 100644
--- a/man1/git-shortlog.1
+++ b/man1/git-shortlog.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHORTLOG" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-SHORTLOG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1
index 96c40b725..cac0f3a04 100644
--- a/man1/git-show-branch.1
+++ b/man1/git-show-branch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHOW\-BRANCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-BRANCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-show-index.1 b/man1/git-show-index.1
index 1cc811b05..b439044e6 100644
--- a/man1/git-show-index.1
+++ b/man1/git-show-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHOW\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1
index 80122c07d..c9f15429b 100644
--- a/man1/git-show-ref.1
+++ b/man1/git-show-ref.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHOW\-REF" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-show.1 b/man1/git-show.1
index 0a3035a4a..f1936a8d9 100644
--- a/man1/git-show.1
+++ b/man1/git-show.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHOW" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-SHOW" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-ssh-fetch.1 b/man1/git-ssh-fetch.1
index 7128a4b2b..7ac32f5d0 100644
--- a/man1/git-ssh-fetch.1
+++ b/man1/git-ssh-fetch.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SSH\-FETCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SSH\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-ssh-upload.1 b/man1/git-ssh-upload.1
index 3c3cc2dbd..802a052f9 100644
--- a/man1/git-ssh-upload.1
+++ b/man1/git-ssh-upload.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SSH\-UPLOAD" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SSH\-UPLOAD" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-status.1 b/man1/git-status.1
index 539392101..c71ee2afe 100644
--- a/man1/git-status.1
+++ b/man1/git-status.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-STATUS" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-STATUS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -21,8 +21,8 @@ The command takes the same set of options as git\-commit; it shows what would be
 The output from this command is designed to be used as a commit template comments, and all the output lines are prefixed with \fI#\fR.
 .SH "CONFIGURATION"
 The command honors color.status (or status.color \(em they mean the same thing and the latter is kept for backward compatibility) and color.status.<slot> configuration variables to colorize its output.
-
-As for \fBgit\-add\fR(1), the configuration variable \fIcore.excludesfile\fR can indicate a path to a file containing patterns of file names to exclude, in addition to patterns given in \fIinfo/exclude\fR and \fI.gitignore\fR.
+.SH "SEE ALSO"
+\fBgitignore\fR(5)
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>.
 .SH "DOCUMENTATION"
diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1
index 098a2bbfa..4d8254ecc 100644
--- a/man1/git-stripspace.1
+++ b/man1/git-stripspace.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-STRIPSPACE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-STRIPSPACE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-svn.1 b/man1/git-svn.1
index c54c870a5..347a89f94 100644
--- a/man1/git-svn.1
+++ b/man1/git-svn.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SVN" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-SVN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1
index 682cf2bed..94c79785a 100644
--- a/man1/git-svnimport.1
+++ b/man1/git-svnimport.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SVNIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SVNIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1
index 535c7b473..79437dd77 100644
--- a/man1/git-symbolic-ref.1
+++ b/man1/git-symbolic-ref.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SYMBOLIC\-REF" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SYMBOLIC\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-tag.1 b/man1/git-tag.1
index 11ceeb53d..174a2cd98 100644
--- a/man1/git-tag.1
+++ b/man1/git-tag.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-TAG" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
+.TH "GIT\-TAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-tar-tree.1 b/man1/git-tar-tree.1
index 320b77d05..4ffdba815 100644
--- a/man1/git-tar-tree.1
+++ b/man1/git-tar-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-TAR\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-TAR\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1
index 16d2a4b6d..9d78ff896 100644
--- a/man1/git-unpack-file.1
+++ b/man1/git-unpack-file.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UNPACK\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UNPACK\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1
index 8b2c2b75a..afb5a6d12 100644
--- a/man1/git-unpack-objects.1
+++ b/man1/git-unpack-objects.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UNPACK\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UNPACK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-update-index.1 b/man1/git-update-index.1
index 2972adbae..0abc284ad 100644
--- a/man1/git-update-index.1
+++ b/man1/git-update-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UPDATE\-INDEX" "1" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual"
+.TH "GIT\-UPDATE\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1
index 2cf28e61e..2273be108 100644
--- a/man1/git-update-ref.1
+++ b/man1/git-update-ref.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UPDATE\-REF" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual"
+.TH "GIT\-UPDATE\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1
index a50cebc42..460ff59f2 100644
--- a/man1/git-update-server-info.1
+++ b/man1/git-update-server-info.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UPDATE\-SERVER\-IN" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPDATE\-SERVER\-IN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1
index 1f88a1a0d..987523bdb 100644
--- a/man1/git-upload-archive.1
+++ b/man1/git-upload-archive.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UPLOAD\-ARCHIVE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPLOAD\-ARCHIVE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1
index cf81948fe..a10504b40 100644
--- a/man1/git-upload-pack.1
+++ b/man1/git-upload-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-UPLOAD\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPLOAD\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-var.1 b/man1/git-var.1
index fefe4c9f1..d340811ff 100644
--- a/man1/git-var.1
+++ b/man1/git-var.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-VAR" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VAR" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1
index 795a69b6d..7fdd112cb 100644
--- a/man1/git-verify-pack.1
+++ b/man1/git-verify-pack.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-VERIFY\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VERIFY\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1
index 65fe24051..9e9866e0a 100644
--- a/man1/git-verify-tag.1
+++ b/man1/git-verify-tag.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-VERIFY\-TAG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VERIFY\-TAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1
index db41207be..a3f73e12a 100644
--- a/man1/git-whatchanged.1
+++ b/man1/git-whatchanged.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-WHATCHANGED" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-WHATCHANGED" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1
index c8d330a6c..1cb389125 100644
--- a/man1/git-write-tree.1
+++ b/man1/git-write-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-WRITE\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-WRITE\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man1/gitk.1 b/man1/gitk.1
index aa8146570..68d294271 100644
--- a/man1/gitk.1
+++ b/man1/gitk.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GITK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GITK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man5/gitattributes.5 b/man5/gitattributes.5
index 1296f511d..4efff4fad 100644
--- a/man5/gitattributes.5
+++ b/man5/gitattributes.5
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GITATTRIBUTES" "5" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GITATTRIBUTES" "5" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/man5/gitignore.5 b/man5/gitignore.5
new file mode 100644
index 000000000..1e0e2e338
--- /dev/null
+++ b/man5/gitignore.5
@@ -0,0 +1,89 @@
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "GITIGNORE" "5" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+gitignore \- Specifies intentionally untracked files to ignore
+.SH "SYNOPSIS"
+$GIT_DIR/info/exclude, .gitignore
+.SH "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:
+.TP 3
+\(bu
+Patterns read from the file specified by the configuration variable \fIcore.excludesfile\fR.
+.TP
+\(bu
+Patterns read from $GIT_DIR/info/exclude.
+.TP
+\(bu
+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 \fBgit\-ls\-files\fR(1) and \fBgit\-read\-tree\fR(1), read gitignore patterns specified by command\-line options, or from files specified by command\-line options. Higher\-level git tools, such as \fBgit\-status\fR(1) and \fBgit\-add\fR(1), use patterns from the sources specified above.
+
+Patterns have the following format:
+.TP 3
+\(bu
+A blank line matches no files, so it can serve as a separator for readability.
+.TP
+\(bu
+A line starting with # serves as a comment.
+.TP
+\(bu
+An optional prefix \fI!\fR which negates the pattern; any matching file excluded by a previous pattern will become included again.
+.TP
+\(bu
+If the pattern does not contain a slash \fI/\fR, git treats it as a shell glob pattern and checks for a match against the pathname without leading directories.
+.TP
+\(bu
+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:
+.sp
+.nf
+    $ 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
+    [...]
+.fi
+Another example:
+.sp
+.nf
+    $ cat .gitignore
+    vmlinux*
+    $ ls arch/foo/kernel/vm*
+    arch/foo/kernel/vmlinux.lds.S
+    $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
+.fi
+The second .gitignore prevents git from ignoring arch/foo/kernel/vmlinux.lds.S.
+.SH "DOCUMENTATION"
+Documentation by David Greaves, Junio C Hamano, Josh Triplett, Frank Lichtenheld, and the git\-list <git@vger.kernel.org>.
+.SH "GIT"
+Part of the \fBgit\fR(7) suite
+
diff --git a/man7/git.7 b/man7/git.7
index ededbb085..db1a46f2f 100644
--- a/man7/git.7
+++ b/man7/git.7
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT" "7" "05/20/2007" "Git 1.5.2" "Git Manual"
+.TH "GIT" "7" "06/02/2007" "Git 1.5.2" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)