git-reflog: gc.* configuration and documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>

3 files changed, 71 insertions, 0 deletions

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4d636267a..6452a8be1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -192,6 +192,15 @@ format.headers::
 	Additional email headers to include in a patch to be submitted
 	by mail.  See gitlink:git-format-patch[1].
 
+gc.reflogexpire::
+	`git reflog expire` removes reflog entries older than
+	this time; defaults to 90 days.
+
+gc.reflogexpireunreachable::
+	`git reflog expire` removes reflog entries older than
+	this time and are not reachable from the current tip;
+	defaults to 30 days.
+
 gc.rerereresolved::
 	Records of conflicted merge you resolved earlier are
 	kept for this many days when `git rerere gc` is run.
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
new file mode 100644
index 000000000..55a24d326
--- /dev/null
+++ b/Documentation/git-reflog.txt
@@ -0,0 +1,59 @@
+git-reflog(1)
+=============
+
+NAME
+----
+git-reflog - Manage reflog information
+
+
+SYNOPSIS
+--------
+[verse]
+'git-reflog' expire [--dry-run]
+	[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
+
+
+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 -- instead, see gitlink:git-gc[1].
+
+
+
+OPTIONS
+-------
+
+--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.
+
+--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.
+
+--all::
+	Instead of listing <refs> explicitly, prune all refs.
+
+Author
+------
+Written by Junio C Hamano <junkio@cox.net>
+
+Documentation
+--------------
+Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2a9e97dac..4ed3eed13 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -224,6 +224,9 @@ gitlink:git-prune[1]::
 gitlink:git-quiltimport[1]::
 	Applies a quilt patchset onto the current branch.
 
+gitlink:git-reflog[1]::
+	Manage reflog information.
+
 gitlink:git-relink[1]::
 	Hardlink common objects in local repositories.