cherry-pick: rewrap advice message

The current message overflows on an 80-character terminal.
While we're at it, fix the spelling of 'committing'.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-revert.c b/builtin-revert.c
index 8ac86f09434d1dad830c924de8cadcef6705e1e5..83e5c0a755846063a11e3c16432a3faa358d1359 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -213,13 +213,13 @@ static char *help_msg(const unsigned char *sha1)
                return msg;
 
        strcpy(helpbuf, "  After resolving the conflicts,\n"
                return msg;
 
        strcpy(helpbuf, "  After resolving the conflicts,\n"

-              "mark the corrected paths with 'git add <paths>' "
-              "or 'git rm <paths>' and commit the result.");
+               "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
+               "and commit the result.");

 
        if (action == CHERRY_PICK) {
                sprintf(helpbuf + strlen(helpbuf),
 
        if (action == CHERRY_PICK) {
                sprintf(helpbuf + strlen(helpbuf),

-                       "\nWhen commiting, use the option "
-                       "'-c %s' to retain authorship and message.",
+                       "  When committing, use the option '-c %s'\n"
+                       "to retain authorship and message.",

                        find_unique_abbrev(sha1, DEFAULT_ABBREV));
        }
        return helpbuf;
                        find_unique_abbrev(sha1, DEFAULT_ABBREV));
        }
        return helpbuf;