diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-27 10:59:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-27 10:59:55 +0000 |
| commit | 7464064e9210aaa7590eb4ee592a1d3e069c386f (patch) | |
| tree | b6715f991615f10e03efcdd278eaab31ee133810 /git-rerere.html | |
| parent | d793de567fd684f8a0cf42af9252cb37cba2d2b0 (diff) | |
| download | git-htmldocs-7464064e9210aaa7590eb4ee592a1d3e069c386f.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc0-g4aec
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/git-rerere.html b/git-rerere.html index aee041597..d5b299cb7 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -272,7 +272,7 @@ git-rerere(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-rerere</em> [clear|diff|status]</p>
+<p><em>git-rerere</em> [clear|diff|status|gc]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -336,7 +336,11 @@ for resolutions. <dd>
<p>
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
+<tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration
+variables.
</p>
</dd>
</dl>
@@ -478,7 +482,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Dec-2006 21:32:08 UTC
+Last updated 27-Dec-2006 10:59:44 UTC
</div>
</div>
</body>
|