Documentation: rerere is enabled by default these days.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

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
 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.
 
 gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index c4d4263238e5b7c6dff705de5d8552a577fc35d6..8ce492c8f2738275aa951f2fd98f1bcca16baee6 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -22,10 +22,6 @@ automerge results and corresponding hand-resolve results on the
 initial manual merge, and later by noticing the same automerge
 results and applying the previously recorded hand resolution.
 
 initial manual merge, and later by noticing the same automerge
 results and applying the previously recorded hand resolution.
 

-[NOTE]
-You need to set the config variable rerere.enabled to enable this
-command.
-

 
 COMMANDS
 --------
 
 COMMANDS
 --------