summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-14 23:10:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-15 00:14:29 (GMT)
commit11c57e6a9a0f31f970701a673adaa1826f502fa0 (patch)
treea699e3ad06fcac5cebd98e89051fe0201196964a /Documentation/config.txt
parente87e22d0f22eb262a90e76197465d6cfd9707ea1 (diff)
downloadgit-11c57e6a9a0f31f970701a673adaa1826f502fa0.zip
git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.gz
git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.bz2
Fix git-rerere documentation
rerere.enabled is _not_ on by default. The command is enabled if rr-cache exists even when rerere.enabled is missing, and enabled or disabled by explicitly setting the rerere.enabled variable.
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index df091d1..877eda9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -543,8 +543,8 @@ rerere.enabled::
Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they
be encountered again. linkgit:git-rerere[1] command is by
- default enabled, but can be disabled by setting this option to
- false.
+ default enabled if you create `rr-cache` directory under
+ `$GIT_DIR`, but can be disabled by setting this option to false.
gitcvs.enabled::
Whether the CVS server interface is enabled for this repository.