Mention that git-rm can be an appropriate resolution as well as git-add.
PATCH 1/1 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]>
--- builtin-revert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
builtin-revert.c +1 -1
@@ -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 "
Signature · 1 line
1.5.3.1
Quoted 5 lines · David Symonds
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]>
This would be a good wording change; I'll munge this for 'next'.
Thanks.