Documentation: rerere's rr-cache auto-creation and rerere.enabled
The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 10, 2012 at 15:57 UTC
b6fb7fed6afca3376e4cdd70c9fe9737bcd73a6e
1 file changed
+2
-1
Documentation/config.txt
+2
-1
@@ -1703,7 +1703,8 @@ rerere.enabled::
1703
conflict hunks can be resolved automatically, should they be
1704
encountered again. By default, linkgit:git-rerere[1] is
1705
enabled if there is an `rr-cache` directory under the
1706
- `$GIT_DIR`.
1706
+ `$GIT_DIR`, e.g. if "rerere" was previously used in the
1707
+ repository.
1708
1709
sendemail.identity::
1710
A configuration identity. When given, causes values in the