diff options
| author | David Symonds <dsymonds@gmail.com> | 2007-11-24 00:38:50 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-30 14:15:08 -0800 |
| commit | 0d8135891eb81d06d818a53c479ea3798df96e3a (patch) | |
| tree | 6dbf77e17664593b28544868550c6f8771046f97 /builtin-revert.c | |
| parent | 804c7174c9d7c81b5215bcd9002f3bd600ecb6e4 (diff) | |
| download | git-0d8135891eb81d06d818a53c479ea3798df96e3a.tar.gz git-0d8135891eb81d06d818a53c479ea3798df96e3a.tar.xz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
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), |