[PATCH] git-rerere.txt: Mention rr-cache directory

From: Stephan Beyer <s-beyer@gmx.net>
Date: Jul 9, 2008, 00:17 UTC
Message-ID: <1215562653-5043-1-git-send-email-s-beyer@gmx.net>

If a user reads the rerere documentation, he or she is not told to create the $GIT_DIR/rr-cache directory to be able to use git-rerere. This patch adds such a remark.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
 Documentation/git-rerere.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 678bfd3..667505c 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -23,8 +23,8 @@ 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.
+You need to set the configuration variable `rerere.enabled` and create
+the `rr-cache` directory under `$GIT_DIR` to enable this command.
 
 
 COMMANDS
@@ -170,8 +170,8 @@ As a convenience measure, 'git-merge' automatically invokes
 records it if it is a new conflict, or reuses the earlier hand
 resolve when it is not.  'git-commit' also invokes 'git-rerere'
 when recording a merge result.  What this means is that you do
-not have to do anything special yourself (Note: you still have
-to set the config variable rerere.enabled to enable this command).
+not have to do anything special yourself, except making sure
+that `rerere.enabled` is set and `$GIT_DIR/rr-cache` exists.
 
 In our example, when you did the test merge, the manual
 resolution is recorded, and it will be reused when you do the

-- 
1.5.6.2.574.gd4568