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 <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Jan 6, 2012 at 14:08 UTC
07b88a00c0caac055a9f52167523248a75711842
1 file changed
+4
-4
Documentation/config.txt
+4
-4
@@ -1700,10 +1700,10 @@ rerere.autoupdate::
1700
1701
rerere.enabled::
1702
Activate recording of resolved conflicts, so that identical
1703
- conflict hunks can be resolved automatically, should they
1704
- be encountered again. linkgit:git-rerere[1] command is by
1705
- default enabled if you create `rr-cache` directory under
1706
- `$GIT_DIR`, but can be disabled by setting this option to false.
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`.
1707
1708
sendemail.identity::
1709
A configuration identity. When given, causes values in the