Mention that git-rm can be an appropriate resolution as well as git-add.
Especially when using git-cherry-pick, removing files that are unmerged can be a logical action. This patch merely changes the informative text to be less confusing. Signed-off-by: David Symonds <dsymonds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Symonds committed
Nov 24, 2007 at 00:38 UTC
0d8135891eb81d06d818a53c479ea3798df96e3a
1 file changed
+1
-1
builtin-revert.c
+1
-1
@@ -234,7 +234,7 @@ static char *help_msg(const unsigned char *sha1)
234
235
strcpy(helpbuf, " After resolving the conflicts,\n"
236
"mark the corrected paths with 'git add <paths>' "
237
- "and commit the result.");
237
+ "or 'git rm <paths>' and commit the result.");
238
239
if (action == CHERRY_PICK) {
240
sprintf(helpbuf + strlen(helpbuf),