aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2012-01-06 14:08:02 +0100
committerJunio C Hamano <gitster@pobox.com>2012-01-06 12:27:59 -0800
commit07b88a00c0caac055a9f52167523248a75711842 (patch)
tree64148c4dc41c2d3cfcc4a37a5c77569fa55b124a
parent5c951ef47bf2e34dbde58bda88d430937657d2aa (diff)
downloadgit-07b88a00c0caac055a9f52167523248a75711842.tar.gz
git-07b88a00c0caac055a9f52167523248a75711842.tar.xz
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>
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
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