From 4f571479384cf81c4526ae29d8c79843aefd3cd1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 4 Dec 2007 00:40:55 -0800 Subject: Documentation: rerere is enabled by default these days. Signed-off-by: Junio C Hamano --- Documentation/git-rerere.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Documentation/git-rerere.txt') diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index c4d426323..8ce492c8f 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 -------- -- cgit v1.2.1