summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-27 09:24:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-27 09:33:24 (GMT)
commit48c3242450fe5fb18e6890812c000ed5c6291a98 (patch)
treeb8325ffabcccbdc389395e1b6e828c77d1029362 /Documentation/git-rerere.txt
parentae72f685418b79bbd67e1017c5b1ac7d731c042e (diff)
downloadgit-48c3242450fe5fb18e6890812c000ed5c6291a98.zip
git-48c3242450fe5fb18e6890812c000ed5c6291a98.tar.gz
git-48c3242450fe5fb18e6890812c000ed5c6291a98.tar.bz2
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 <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 116dca4..b57a72b 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