X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=8030ec4d01de8cf2c7a62a7b1fd8d917e6d14b53;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=3793267dadfa52a30cb59ad75170f5f9e9b8e81f;hpb=e708af6e587ae0ecb2a6480e3614c5ec4a164106;p=git.git

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 3793267da..8030ec4d0 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -22,6 +22,10 @@ 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.
 
+[NOTE]
+You need to set the configuration variable rerere.enabled to
+enable this command.
+
 
 COMMANDS
 --------
@@ -204,4 +208,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite