X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=8ce492c8f2738275aa951f2fd98f1bcca16baee6;hb=530e741;hp=c4d4263238e5b7c6dff705de5d8552a577fc35d6;hpb=b9dcf846e20ed5287e239c9a0942c5d150081bab;p=git.git 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 --------