summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: df73af5)
raw | patch | inline | side by side (parent: df73af5)
author | Michael J Gruber <git@drmicha.warpmail.net> | |
Tue, 28 Jul 2009 14:42:15 +0000 (16:42 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 28 Jul 2009 20:30:42 +0000 (13:30 -0700) |
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>
"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>
Documentation/git-rerere.txt | patch | blob | history |
index a53c3cd35b8d6c8be27d90f64013b377d205f201..7dd515b8ccde701ccf5743f80b3b762813ea90c9 100644 (file)
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.