diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2009-07-28 16:42:15 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-07-28 13:30:42 -0700 |
| commit | 02944cc4929c6a7438dbde9216f9ebb193f1ae81 (patch) | |
| tree | f93a99684ca0a60bbc73fb93fe75014784346292 /Documentation | |
| parent | t9143: do not fail if Compress::Zlib is missing (diff) | |
| download | tgif-02944cc4929c6a7438dbde9216f9ebb193f1ae81.tar.xz | |
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 <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index a53c3cd35b..7dd515b8cc 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. |