summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-04 08:40:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-04 08:40:55 (GMT)
commit4f571479384cf81c4526ae29d8c79843aefd3cd1 (patch)
treee211a8be123694910b50fa7614be1f2087b207ef /Documentation/config.txt
parentdada0c12120d7ef88a63adb4240963a96655f962 (diff)
downloadgit-4f571479384cf81c4526ae29d8c79843aefd3cd1.zip
git-4f571479384cf81c4526ae29d8c79843aefd3cd1.tar.gz
git-4f571479384cf81c4526ae29d8c79843aefd3cd1.tar.bz2
Documentation: rerere is enabled by default these days.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6ae1184..72a33e9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -507,7 +507,9 @@ gc.rerereunresolved::
rerere.enabled::
Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they
- be encountered again. See gitlink:git-rerere[1].
+ be encountered again. gitlink:git-rerere[1] command is by
+ default enabled, but can be disabled by setting this option to
+ false.
gitcvs.enabled::
Whether the CVS server interface is enabled for this repository.