From: David Symonds <dsymonds@gmail.com>
Date: Fri, 23 Nov 2007 13:38:50 +0000 (+1100)
Subject: Mention that git-rm can be an appropriate resolution as well as git-add.
X-Git-Tag: v1.5.4-rc0~106^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d8135891eb81d06d818a53c479ea3798df96e3a;p=git.git

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>
---

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 <paths>' "
-	       "and commit the result.");
+	       "or 'git rm <paths>' and commit the result.");
 
 	if (action == CHERRY_PICK) {
 		sprintf(helpbuf + strlen(helpbuf),