git-cvsserver runs hooks/post-receive

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6ae11842e5d71f201f8901922db8d9bdafb2d17b..72a33e98b2e0d7a24087b80c3e28f62a05aab439 100644 (file)
--- 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.