From: Junio C Hamano Date: Mon, 14 Jan 2008 23:10:38 +0000 (-0800) Subject: Fix git-rerere documentation X-Git-Tag: v1.5.4-rc4~38 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=11c57e6a9a0f31f970701a673adaa1826f502fa0;p=git.git Fix git-rerere documentation rerere.enabled is _not_ on by default. The command is enabled if rr-cache exists even when rerere.enabled is missing, and enabled or disabled by explicitly setting the rerere.enabled variable. --- diff --git a/Documentation/config.txt b/Documentation/config.txt index df091d1b8..877eda960 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -543,8 +543,8 @@ 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, but can be disabled by setting this option to - false. + default enabled if you create `rr-cache` directory under + `$GIT_DIR`, 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 3793267da..a53858e25 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -22,6 +22,10 @@ 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 configuration variable rerere.enabled to +enable this command. + COMMANDS -------- diff --git a/Makefile b/Makefile index 21c80e6bf..82e9cd626 100644 --- a/Makefile +++ b/Makefile @@ -1187,3 +1187,4 @@ check-docs:: # check-builtins:: ./check-builtins.sh +