From: Jeff King <peff@peff.net>
Date: Thu, 11 Feb 2010 21:06:01 +0000 (-0500)
Subject: cherry-pick: rewrap advice message
X-Git-Tag: v1.7.0.1~16^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e359978e9792a83e8b45c0b76c3974518d2c738;p=git.git

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 8ac86f094..83e5c0a75 100644
--- 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"
-	       "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),
-			"\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;