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>
Jeff King committed
Feb 11, 2010 at 16:06 UTC
6e359978e9792a83e8b45c0b76c3974518d2c738
1 file changed
+4
-4
builtin-revert.c
+4
-4
@@ -213,13 +213,13 @@ static char *help_msg(const unsigned char *sha1)
213
return msg;
214
215
strcpy(helpbuf, " After resolving the conflicts,\n"
216
- "mark the corrected paths with 'git add <paths>' "
217
- "or 'git rm <paths>' and commit the result.");
216
+ "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
217
+ "and commit the result.");
218
219
if (action == CHERRY_PICK) {
220
sprintf(helpbuf + strlen(helpbuf),
221
- "\nWhen commiting, use the option "
222
- "'-c %s' to retain authorship and message.",
221
+ " When committing, use the option '-c %s'\n"
222
+ "to retain authorship and message.",
223
find_unique_abbrev(sha1, DEFAULT_ABBREV));
224
}
225
return helpbuf;