diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2012-01-06 14:08:02 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:27:59 -0800 |
| commit | 07b88a00c0caac055a9f52167523248a75711842 (patch) | |
| tree | 64148c4dc41c2d3cfcc4a37a5c77569fa55b124a /Documentation/config.txt | |
| parent | Documentation: read-tree --prefix works with existing subtrees (diff) | |
| download | tgif-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>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 87643882fc..18ab1ae65e 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 |