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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
DQNEO · Nov 30, 2007 · 0d81358 · 0d81358
1 parent 804c717
commit 0d81358
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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),