From: Michael J Gruber Date: Tue, 28 Jul 2009 14:42:15 +0000 (+0200) Subject: git-rerere.txt: Clarify ambiguity of the config variable X-Git-Tag: v1.6.4~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02944cc4929c6a7438dbde9216f9ebb193f1ae81;p=git.git git-rerere.txt: Clarify ambiguity of the config variable Use the less ambiguous "set variable foo in order to enable bar" rather than "set variable foo to enable bar" which may trick users into assuming that "enable" is a good value for "foo". Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index a53c3cd35..7dd515b8c 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -23,7 +23,7 @@ on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results. [NOTE] -You need to set the configuration variable rerere.enabled to +You need to set the configuration variable rerere.enabled in order to enable this command.