Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

[git.git] / Documentation / git-rerere.txt

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 3793267dadfa52a30cb59ad75170f5f9e9b8e81f..a53858e2503f52b68739264f026c6532ba733d1f 100644 (file)
--- 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.
 
 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
 --------
 
 COMMANDS
 --------