mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-25 05:11:34 +02:00
Code

Documentation: rerere is enabled by default these days.

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-12-04 00:40:55 -08:00
parent dada0c1212
commit 4f57147938
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -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.

4
Documentation/git-rerere.txt
View File

@ -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
--------