summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-10-30 19:59:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-30 23:49:27 (GMT)
commit04bd8e5fea48a00816b461b0fb934627cfd2c45f (patch)
treeebc278188354368360f4adef67bef5dcd92c35c3 /builtin-revert.c
parentba17892ddc85c0ffe8fecd600c29cb38ec7e5587 (diff)
downloadgit-04bd8e5fea48a00816b461b0fb934627cfd2c45f.zip
git-04bd8e5fea48a00816b461b0fb934627cfd2c45f.tar.gz
git-04bd8e5fea48a00816b461b0fb934627cfd2c45f.tar.bz2
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>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 499bbe7..eafafbc 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -351,7 +351,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
die ("Error wrapping up %s", defmsg);
fprintf(stderr, "Automatic %s failed. "
"After resolving the conflicts,\n"
- "mark the corrected paths with 'git-add <paths>'\n"
+ "mark the corrected paths with 'git add <paths>' "
"and commit the result.\n", me);
if (action == CHERRY_PICK) {
fprintf(stderr, "When commiting, use the option "