cherry-pick: prettify the advice message

It's hard to see the "how to commit" part of this message,
which users may want to cut and paste. On top of that,
having it in paragraph form means that a really long commit
name may cause ugly wrapping. Let's make it prettier, like:

Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

git commit -c HEAD~23

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 ad612497a2aba1039ab19976a147738dec100a8a..eff52687a87b45b766e064eede7c2c35b6d133d2 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -208,14 +208,16 @@ static char *help_msg(const char *name)
 
        strbuf_addstr(&helpbuf, "  After resolving the conflicts,\n"
                "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
 
        strbuf_addstr(&helpbuf, "  After resolving the conflicts,\n"
                "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"

-               "and commit the result.");
+               "and commit the result");

 
        if (action == CHERRY_PICK) {
 
        if (action == CHERRY_PICK) {

-               strbuf_addf(&helpbuf,
-                       "  When committing, use the option '-c %s'\n"
-                       "to retain authorship and message.",
+               strbuf_addf(&helpbuf, " with: \n"
+                       "\n"
+                       "        git commit -c %s\n",

                        name);
        }
                        name);
        }

+       else
+               strbuf_addch(&helpbuf, '.');

        return strbuf_detach(&helpbuf, NULL);
 }
 
        return strbuf_detach(&helpbuf, NULL);
 }