Merge the attributes fix in from maint-1.6.6 branch

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bdd4cb83d347e1044d250ed9c2acab4545efaf13..3bcf660e0256b3706d8d78e3cb152dcf3b1b740a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1711,7 +1711,8 @@ rerere.enabled::
        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`.
+       `$GIT_DIR`, e.g. if "rerere" was previously used in the
+       repository.
 
 sendemail.identity::
        A configuration identity. When given, causes values in the