summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-04 00:40:55 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-04 00:40:55 -0800
commit4f571479384cf81c4526ae29d8c79843aefd3cd1 (patch)
treee211a8be123694910b50fa7614be1f2087b207ef /Documentation/git-rerere.txt
parentdada0c12120d7ef88a63adb4240963a96655f962 (diff)
downloadgit-4f571479384cf81c4526ae29d8c79843aefd3cd1.tar.gz
Documentation: rerere is enabled by default these days.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt4
1 files changed, 0 insertions, 4 deletions
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
--------