Re: [PATCH] rerere: enable by default
From: Andrei Rybak <hidden>
Date: 2021-06-07 10:35:19
On 06/06/2021 14:30, Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
By default, the rerere machinery has been disabled since a bug in the machinery could screw up the end user's data at the most stressful time during the end user's workday (i.e. during conflict resolution). It however has been in wide use without causing much trouble (other than, obviously, replaying a broken conflict resolution that was recorded earlier when the user made a mismerge), and it is about time to enable it by default. Signed-off-by: Junio C Hamano <redacted> --- Documentation/config/rerere.txt | 5 ++--- rerere.c | 12 +++--------- t/t2030-unresolve-info.sh | 3 +++ 3 files changed, 8 insertions(+), 12 deletions(-)diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt index 40abdf6a6b..45e97fc0fa 100644 --- a/Documentation/config/rerere.txt +++ b/Documentation/config/rerere.txt@@ -7,6 +7,5 @@ rerere.enabled:: Activate recording of resolved conflicts, so that identical 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`, e.g. if "rerere" was previously used in the - repository. + enabled, but this configuration can be set to 'false' to
At the moment, backticks are used more often than single quotes
for formatting of boolean values in documentation:
$ git grep -oE "\`(false|true)\`" -- Documentation/*.txt Documentation/config/*.txt | wc -l
121
$ git grep -oE "'(false|true)'" -- Documentation/*.txt Documentation/config/*.txt | wc -l
53
+ turn it off.