summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-02-11 16:06:01 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-11 22:10:57 -0800
commit6e359978e9792a83e8b45c0b76c3974518d2c738 (patch)
tree2042d40514a9f68ac16e132085c9a412e1d6a424 /builtin-revert.c
parent8051a030617cf7d083568cca223bdaa15052c33f (diff)
downloadgit-6e359978e9792a83e8b45c0b76c3974518d2c738.tar.gz
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>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 8ac86f0943..83e5c0a755 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;