From 0d8135891eb81d06d818a53c479ea3798df96e3a Mon Sep 17 00:00:00 2001 From: David Symonds Date: Sat, 24 Nov 2007 00:38:50 +1100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin-revert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-revert.c b/builtin-revert.c index 4f86178bb..4bf8eb2f5 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -234,7 +234,7 @@ static char *help_msg(const unsigned char *sha1) strcpy(helpbuf, " After resolving the conflicts,\n" "mark the corrected paths with 'git add ' " - "and commit the result."); + "or 'git rm ' and commit the result."); if (action == CHERRY_PICK) { sprintf(helpbuf + strlen(helpbuf), -- 2.26.2