cherry-pick/revert: more compact user direction message
A failed cherry-pick (and friend) currently says: |Automatic cherry-pick failed. After resolving the conflicts, |mark the corrected paths with 'git-add <paths>' |and commit the result. This can obviously be displayed on two lines only. While at it, change "git-add" to "git add". Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Oct 30, 2007 at 15:59 UTC
04bd8e5fea48a00816b461b0fb934627cfd2c45f
1 file changed
+1
-1
builtin-revert.c
+1
-1
@@ -351,7 +351,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
351
die ("Error wrapping up %s", defmsg);
352
fprintf(stderr, "Automatic %s failed. "
353
"After resolving the conflicts,\n"
354
- "mark the corrected paths with 'git-add <paths>'\n"
354
+ "mark the corrected paths with 'git add <paths>' "
355
"and commit the result.\n", me);
356
if (action == CHERRY_PICK) {
357
fprintf(stderr, "When commiting, use the option "