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.txt | |
| parent | d793de567fd684f8a0cf42af9252cb37cba2d2b0 (diff) | |
| download | git-htmldocs-7464064e9210aaa7590eb4ee592a1d3e069c386f.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc0-g4aec
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 116dca4c0..b57a72bdd 100644 --- a/git-rerere.txt +++ b/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 |