{"thread":{"id":"10993","subject":"[PATCH] Mention that git-rm can be an appropriate resolution as well as git-add.","startedAt":"2007-11-23T13:38:50Z","lastAt":"2007-12-01T02:36:18Z","messageCount":2,"participants":["David Symonds","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"60762","messageId":"11958251302874-git-send-email-dsymonds@gmail.com","threadId":"10993","inReplyTo":null,"subject":"[PATCH] Mention that git-rm can be an appropriate resolution as well as git-add.","fromName":"David Symonds","fromEmail":"dsymonds@gmail.com","sentAt":"2007-11-23T13:38:50Z","receivedAt":"2007-11-23T13:38:50Z","isPatch":true,"sender":{"key":"dsymonds@gmail.com","avatar":"https://gravatar.com/avatar/b22f5051cbfc11836e36cf7a690e6cde4e225d835e13295ff98d15c7a9ee3c0f?d=mp&s=160"},"body":"Especially when using git-cherry-pick, removing files that are unmerged can be\na logical action. This patch merely changes the informative text to be less\nconfusing.\n\nSigned-off-by: David Symonds <dsymonds@gmail.com>\n---\n builtin-revert.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 365b330..d9ed40d 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -366,7 +366,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)\n \t\t\tdie (\"Error wrapping up %s\", defmsg);\n \t\tfprintf(stderr, \"Automatic %s failed.  \"\n \t\t\t\"After resolving the conflicts,\\n\"\n-\t\t\t\"mark the corrected paths with 'git add <paths>' \"\n+\t\t\t\"mark the corrected paths with 'git add <paths>' or 'git rm <paths>' \"\n \t\t\t\"and commit the result.\\n\", me);\n \t\tif (action == CHERRY_PICK) {\n \t\t\tfprintf(stderr, \"When commiting, use the option \"\n-- \n1.5.3.1\n"},{"id":"61540","messageId":"7vr6i79m59.fsf@gitster.siamese.dyndns.org","threadId":"10993","inReplyTo":"11958251302874-git-send-email-dsymonds@gmail.com","subject":"Re: [PATCH] Mention that git-rm can be an appropriate resolution as well as git-add.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-01T02:36:18Z","receivedAt":"2007-12-01T02:36:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Symonds <dsymonds@gmail.com> writes:\n\n> Especially when using git-cherry-pick, removing files that are unmerged can be\n> a logical action. This patch merely changes the informative text to be less\n> confusing.\n>\n> Signed-off-by: David Symonds <dsymonds@gmail.com>\n\nThis would be a good wording change; I'll munge this for 'next'.\n\nThanks.\n"}]}