X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=a53858e2503f52b68739264f026c6532ba733d1f;hb=0c829391cfcdc57172765322575804a7ad5f3116;hp=3793267dadfa52a30cb59ad75170f5f9e9b8e81f;hpb=5162e69732d13dd079919a389a6ace8878aad716;p=git.git diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 3793267da..a53858e25 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -22,6 +22,10 @@ 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 configuration variable rerere.enabled to +enable this command. + COMMANDS --------