X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=9fba453f23754b3afc3268f9e6c1db90dca3e55e;hb=aa9828561e562a0b9ca559be4225de679b8e8be3;hp=f22d926777155b204e4408dd5fd468938f26d28d;hpb=b42e81afe2d98faee7728ef02a558847fd08cf90;p=git.git

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f22d92677..9fba453f2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1737,10 +1737,11 @@ rerere.autoupdate::
 
 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 if you create `rr-cache` directory under
-	`$GIT_DIR`, but can be disabled by setting this option to false.
+	conflict hunks can be resolved automatically, should they be
+	encountered again.  By default, linkgit:git-rerere[1] is
+	enabled if there is an `rr-cache` directory under the
+	`$GIT_DIR`, e.g. if "rerere" was previously used in the
+	repository.
 
 sendemail.identity::
 	A configuration identity. When given, causes values in the