From 48c3242450fe5fb18e6890812c000ed5c6291a98 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Dec 2006 01:24:05 -0800 Subject: rerere gc: honor configuration and document it Two configuration to control the expiration of rerere records are introduced and documented. Signed-off-by: Junio C Hamano --- Documentation/git-rerere.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Documentation/git-rerere.txt') diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 116dca4c06..b57a72bdd7 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 -- cgit v1.2.3