path: root/builtin-revert.c
diff options
authorJunio C Hamano <>2007-10-31 04:44:43 (GMT)
committerJunio C Hamano <>2007-10-31 04:44:43 (GMT)
commit9c51414f8efb73525a6c69917f1499dab081679d (patch)
treec10e59ae2c3257c5e5a8d108a2e4f5b6f6fe7995 /builtin-revert.c
parent7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a (diff)
parent0bdb5af7a571ee2bd71550a545632b1cb7f8f8f3 (diff)
Merge branch 'maint' into HEAD
* maint: Update GIT Release Notes Make 3-way merge strategies work for -p. Don't pass a strategy to git-cherry-pick. Fix --strategy parsing in Make merge-recursive honor diff.renamelimit cherry-pick/revert: more compact user direction message core-tutorial: Use new syntax for git-merge. git-merge: document but discourage the historical syntax Prevent send-pack from segfaulting (backport from 'master') Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example Conflicts:
Diffstat (limited to 'builtin-revert.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index a655c8e..e855b20 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -349,7 +349,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 "