Skip to content

Commit 07b88a0

Browse files
trastgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5c951ef commit 07b88a0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/config.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,10 +1700,10 @@ rerere.autoupdate::
17001700

17011701
rerere.enabled::
17021702
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`.
17071707

17081708
sendemail.identity::
17091709
A configuration identity. When given, causes values in the

0 commit comments

Comments
 (0)