Documentation: rerere is enabled by default these days.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 4, 2007 at 00:40 UTC
4f571479384cf81c4526ae29d8c79843aefd3cd1
2 files changed
+3
-5
Documentation/config.txt
+3
-1
@@ -507,7 +507,9 @@ gc.rerereunresolved::
507
rerere.enabled::
508
Activate recording of resolved conflicts, so that identical
509
conflict hunks can be resolved automatically, should they
510
- be encountered again. See gitlink:git-rerere[1].
510
+ be encountered again. gitlink:git-rerere[1] command is by
511
+ default enabled, but can be disabled by setting this option to
512
+ false.
513
514
gitcvs.enabled::
515
Whether the CVS server interface is enabled for this repository.
Documentation/git-rerere.txt
-4
@@ -22,10 +22,6 @@ 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 config variable rerere.enabled to enable this
27
-command.
28
-
25
26
COMMANDS
27
--------