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.
Junio C Hamano committed
Jan 14, 2008 at 15:10 UTC
11c57e6a9a0f31f970701a673adaa1826f502fa0
3 files changed
+7
-2
Documentation/config.txt
+2
-2
@@ -543,8 +543,8 @@ rerere.enabled::
543
Activate recording of resolved conflicts, so that identical
544
conflict hunks can be resolved automatically, should they
545
be encountered again. linkgit:git-rerere[1] command is by
546
- default enabled, but can be disabled by setting this option to
547
- false.
546
+ default enabled if you create `rr-cache` directory under
547
+ `$GIT_DIR`, but can be disabled by setting this option to false.
548
549
gitcvs.enabled::
550
Whether the CVS server interface is enabled for this repository.
Documentation/git-rerere.txt
+4
@@ -22,6 +22,10 @@ automerge results and corresponding hand-resolve results on the
22
initial manual merge, and later by noticing the same automerge
23
results and applying the previously recorded hand resolution.
24
25
+[NOTE]
26
+You need to set the configuration variable rerere.enabled to
27
+enable this command.
28
+
29
30
COMMANDS
31
--------
Makefile
+1
@@ -1187,3 +1187,4 @@ check-docs::
1187
#
1188
check-builtins::
1189
./check-builtins.sh
1190
+