mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry-pick: rewrap advice message

Browse Source 
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>
This commit is contained in:
Jeff King
2010-02-11 16:06:01 -05:00
committed by Junio C Hamano
parent 8051a03061
commit 6e359978e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-revert.c
View File

@ -213,13 +213,13 @@ static char *help_msg(const unsigned char *sha1)
return msg; return msg;
strcpy(helpbuf, " After resolving the conflicts,\n" strcpy(helpbuf, " After resolving the conflicts,\n"
"mark the corrected paths with 'git add <paths>' " "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
"or 'git rm <paths>' and commit the result."); "and commit the result.");
if (action == CHERRY_PICK) { if (action == CHERRY_PICK) {
sprintf(helpbuf + strlen(helpbuf), sprintf(helpbuf + strlen(helpbuf),
"\nWhen commiting, use the option " " When committing, use the option '-c %s'\n"
"'-c %s' to retain authorship and message.", "to retain authorship and message.",
find_unique_abbrev(sha1, DEFAULT_ABBREV)); find_unique_abbrev(sha1, DEFAULT_ABBREV));
} }
return helpbuf; return helpbuf;