summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorDavid Symonds <dsymonds@gmail.com>2007-11-23 13:38:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-30 22:15:08 (GMT)
commit0d8135891eb81d06d818a53c479ea3798df96e3a (patch)
tree6dbf77e17664593b28544868550c6f8771046f97 /builtin-revert.c
parent804c7174c9d7c81b5215bcd9002f3bd600ecb6e4 (diff)
downloadgit-0d8135891eb81d06d818a53c479ea3798df96e3a.zip
git-0d8135891eb81d06d818a53c479ea3798df96e3a.tar.gz
git-0d8135891eb81d06d818a53c479ea3798df96e3a.tar.bz2
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>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 4f86178..4bf8eb2 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),