From: Thomas Rast Date: Fri, 6 Jan 2012 13:08:02 +0000 (+0100) Subject: Documentation: rerere.enabled is the primary way to configure rerere X-Git-Tag: v1.7.8.3~2^2^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07b88a00c0caac055a9f52167523248a75711842;p=git.git Documentation: rerere.enabled is the primary way to configure rerere The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 87643882f..18ab1ae65 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1700,10 +1700,10 @@ rerere.autoupdate:: rerere.enabled:: Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. linkgit:git-rerere[1] command is by - default enabled if you create `rr-cache` directory under - `$GIT_DIR`, but can be disabled by setting this option to false. + 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`. sendemail.identity:: A configuration identity. When given, causes values in the