Merge branch 'maint-1.7.6' into maint-1.7.7

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eae75a39c0bcc779ed2c66ef6fa9b03a24a4a2fd..bdd4cb83d347e1044d250ed9c2acab4545efaf13 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1708,10 +1708,10 @@ 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`.
 
 sendemail.identity::
        A configuration identity. When given, causes values in the