From: Junio C Hamano Date: Tue, 10 Jan 2012 14:57:27 +0000 (+0100) Subject: Documentation: rerere's rr-cache auto-creation and rerere.enabled X-Git-Tag: v1.7.9-rc1~8^2~1^2~1^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6fb7fed6afca3376e4cdd70c9fe9737bcd73a6e;p=thirdparty%2Fgit.git 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 --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 18ab1ae65e..27b57d226b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1703,7 +1703,8 @@ rerere.enabled:: conflict hunks can be resolved automatically, should they be encountered again. By default, linkgit:git-rerere[1] is enabled if there is an `rr-cache` directory under the - `$GIT_DIR`. + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. sendemail.identity:: A configuration identity. When given, causes values in the