Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pack-objects: reverse the delta search sort list
[gitweb.git]
/
builtin-revert.c
diff --git
a/builtin-revert.c
b/builtin-revert.c
index 4f86178bbd4917c6b36eb9c80aeee5bd588edbc0..4bf8eb2f58ac5a81a9d6538e31f2da661db4c3e9 100644
(file)
--- 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),