diff --git a/Documentation/config.txt b/Documentation/config.txt index 18ab1ae65e5..27b57d226bc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1703,7 +1703,8 @@ rerere.enabled:: 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`. + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. sendemail.identity:: A configuration identity. When given, causes values in the