[PATCH] Mention that git-rm can be an appropriate resolution as well as git-add.

David Symonds· Nov 23, 2007, 13:38 UTC · lore

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>
---
 builtin-revert.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to builtin-revert.c +1 −1

diff --git a/builtin-revert.c b/builtin-revert.c
index 365b330..d9ed40d 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -366,7 +366,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>' "
+			"mark the corrected paths with 'git add <paths>' or 'git rm <paths>' "
 			"and commit the result.\n", me);
 		if (action == CHERRY_PICK) {
 			fprintf(stderr, "When commiting, use the option "

-- 
1.5.3.1

Junio C Hamano· Dec 1, 2007, 02:36 UTC · re: David Symonds · lore

Re: [PATCH] Mention that git-rm can be an appropriate resolution as well as git-add.

David Symonds <dsymonds@gmail.com> writes:

Show 5 quoted lines

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

This would be a good wording change; I'll munge this for 'next'.

Thanks.

patchMention that git-rm can be an appropriate resolution as well as git-add.