diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-04 00:40:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-04 00:40:55 -0800 |
| commit | 4f571479384cf81c4526ae29d8c79843aefd3cd1 (patch) | |
| tree | e211a8be123694910b50fa7614be1f2087b207ef /Documentation | |
| parent | dada0c12120d7ef88a63adb4240963a96655f962 (diff) | |
| download | git-4f571479384cf81c4526ae29d8c79843aefd3cd1.tar.gz | |
Documentation: rerere is enabled by default these days.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-rerere.txt | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6ae11842e5..72a33e98b2 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 c4d4263238..8ce492c8f2 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 -------- |