Sync with 1.7.8.3

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6e63b5938f60f544cf3db3ce0d9a277964e99115..27c7689007556e288b55107cfcb0f04d94b6c16e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1772,10 +1772,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