X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=b57a72bdd776c2ecd38adeb97497a3b19be704e7;hb=c6d499a82fbb02e2a03fe3d858ff144fa570fb34;hp=116dca4c0668488a0ba55b43a10e89c40f087b59;hpb=f388cec3d77751a6c20b3b10415344f5355b5a2f;p=git.git

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 116dca4c0..b57a72bdd 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolve
 
 SYNOPSIS
 --------
-'git-rerere' [clear|diff|status]
+'git-rerere' [clear|diff|status|gc]
 
 DESCRIPTION
 -----------
@@ -55,7 +55,11 @@ for resolutions.
 'gc'::
 
 This command is used to prune records of conflicted merge that
-occurred long time ago.
+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.
 
 
 DISCUSSION