From: Junio C Hamano Date: Tue, 4 Dec 2007 08:40:55 +0000 (-0800) Subject: Documentation: rerere is enabled by default these days. X-Git-Tag: v1.5.4-rc0~87 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4f571479384cf81c4526ae29d8c79843aefd3cd1;p=git.git Documentation: rerere is enabled by default these days. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 6ae11842e..72a33e98b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -507,7 +507,9 @@ gc.rerereunresolved:: rerere.enabled:: Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they - be encountered again. See gitlink:git-rerere[1]. + be encountered again. gitlink:git-rerere[1] command is by + default enabled, but can be disabled by setting this option to + false. gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index c4d426323..8ce492c8f 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -22,10 +22,6 @@ automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution. -[NOTE] -You need to set the config variable rerere.enabled to enable this -command. - COMMANDS --------