From 1b3a962ca1122a6e0c13d673fb7f9c8618367441 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 27 Dec 2006 11:00:14 +0000
Subject: [PATCH] Autogenerated man pages for v1.5.0-rc0-g4aec

---
 man1/git-count-objects.1 | 11 +++--------
 man1/git-reflog.1        | 38 ++++++++++++++++++++++++++++++++++++++
 man1/git-repo-config.1   | 14 +++++++++++++-
 man1/git-rerere.1        |  6 +++---
 man7/git.7               |  5 ++++-
 5 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 man1/git-reflog.1

diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1
index b84537feb..99cb3d5c3 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" "10/03/2006" "" ""
+.TH "GIT\-COUNT\-OBJECTS" "1" "12/27/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -11,21 +11,16 @@
 git\-count\-objects \- Reports on unpacked objects
 .SH "SYNOPSIS"
 \fIgit\-count\-objects\fR [\-v]
-.sp
 .SH "DESCRIPTION"
 This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack.
-.sp
 .SH "OPTIONS"
 .TP
 \-v
-In addition to the number of loose objects and disk space consumed, it reports the number of in\-pack objects, and number of objects that can be removed by running
-git\-prune\-packed.
+In addition to the number of loose objects and disk space consumed, it reports the number of in\-pack objects, number of packs, and number of objects that can be removed by running git\-prune\-packed.
 .SH "AUTHOR"
 Written by Junio C Hamano <junkio@cox.net>
-.sp
 .SH "DOCUMENTATION"
 Documentation by Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
 .SH "GIT"
 Part of the \fBgit\fR(7) suite
-.sp
+
diff --git a/man1/git-reflog.1 b/man1/git-reflog.1
new file mode 100644
index 000000000..8565cb67b
--- /dev/null
+++ b/man1/git-reflog.1
@@ -0,0 +1,38 @@
+.\" ** 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 "GIT\-REFLOG" "1" "12/27/2006" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+git\-reflog \- Manage reflog information
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit\-reflog\fR expire [\-\-dry\-run]
+        [\-\-expire=<time>] [\-\-expire\-unreachable=<time>] [\-\-all] <refs>\&...
+.fi
+.SH "DESCRIPTION"
+Reflog is a mechanism to record when the tip of branches are updated. This command is to manage the information recorded in it.
+
+The subcommand "expire" is used to prune older reflog entries. Entries older than expire time, or entries older than expire\-unreachable time and are not reachable from the current tip, are removed from the reflog. This is typically not used directly by the end users \(em instead, see \fBgit\-gc\fR(1).
+.SH "OPTIONS"
+.TP
+\-\-expire=<time>
+Entries older than this time are pruned. Without the option it is taken from configuration gc.reflogExpire, which in turn defaults to 90 days.
+.TP
+\-\-expire\-unreachable=<time>
+Entries older than this time and are not reachable from the current tip of the branch are pruned. Without the option it is taken from configuration gc.reflogExpireUnreachable, which in turn defaults to 30 days.
+.TP
+\-\-all
+Instead of listing <refs> explicitly, prune all refs.
+.SH "AUTHOR"
+Written by Junio C Hamano <junkio@cox.net>
+.SH "DOCUMENTATION"
+Documentation by Junio C Hamano and the git\-list <git@vger.kernel.org>.
+.SH "GIT"
+Part of the \fBgit\fR(7) suite
+
diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index 56021cfb4..61b9fa292 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" "12/19/2006" "" ""
+.TH "GIT\-REPO\-CONFIG" "1" "12/27/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -290,6 +290,18 @@ Tells git to detect renames. If set to any boolean value, it will enable basic r
 format.headers
 Additional email headers to include in a patch to be submitted by mail. See \fBgit\-format\-patch\fR(1).
 .TP
+gc.reflogexpire
+git reflog expire removes reflog entries older than this time; defaults to 90 days.
+.TP
+gc.reflogexpireunreachable
+git reflog expire removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days.
+.TP
+gc.rerereresolved
+Records of conflicted merge you resolved earlier are kept for this many days when git rerere gc is run. The default is 60 days. See \fBgit\-rerere\fR(1).
+.TP
+gc.rerereunresolved
+Records of conflicted merge you have not resolved are kept for this many days when git rerere gc is run. The default is 15 days. See \fBgit\-rerere\fR(1).
+.TP
 gitcvs.enabled
 Whether the cvs pserver interface is enabled for this repository. See \fBgit\-cvsserver\fR(1).
 .TP
diff --git a/man1/git-rerere.1 b/man1/git-rerere.1
index 1270e8606..719fcf21f 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" "12/13/2006" "" ""
+.TH "GIT\-RERERE" "1" "12/27/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -10,7 +10,7 @@
 .SH "NAME"
 git\-rerere \- Reuse recorded resolve
 .SH "SYNOPSIS"
-\fIgit\-rerere\fR [clear|diff|status]
+\fIgit\-rerere\fR [clear|diff|status|gc]
 .SH "DESCRIPTION"
 In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream).
 
@@ -35,7 +35,7 @@ This displays diffs for the current state of the resolution. It is useful for tr
 Like diff, but this only prints the filenames that will be tracked for resolutions.
 .TP
 \fIgc\fR
-This command is used to prune records of conflicted merge that occurred long time ago.
+This command is used to prune records of conflicted merge that occurred long time ago. By default, conflicts older than 15 days that you have not recorded their resolution, and conflicts older than 60 days, are pruned. These are controlled with gc.rerereunresolved and gc.rerereresolved configuration variables.
 .SH "DISCUSSION"
 When your topic branch modifies overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:
 .sp
diff --git a/man7/git.7 b/man7/git.7
index 3dbbb5c9c..21686a0ae 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" "12/17/2006" "" ""
+.TH "GIT" "7" "12/27/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -192,6 +192,9 @@ Prunes all unreachable objects from the object database.
 \fBgit\-quiltimport\fR(1)
 Applies a quilt patchset onto the current branch.
 .TP
+\fBgit\-reflog\fR(1)
+Manage reflog information.
+.TP
 \fBgit\-relink\fR(1)
 Hardlink common objects in local repositories.
 .TP
-- 
2.26.2