{"thread":{"id":"10533","subject":"[PATCH] more compact user direction message","startedAt":"2007-10-30T19:59:24Z","lastAt":"2007-10-30T19:59:24Z","messageCount":1,"participants":["Nicolas Pitre"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"57610","messageId":"alpine.LFD.0.9999.0710301548370.21255@xanadu.home","threadId":"10533","inReplyTo":null,"subject":"[PATCH] more compact user direction message","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2007-10-30T19:59:24Z","receivedAt":"2007-10-30T19:59:24Z","isPatch":true,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"A failed cherry-pick (and friend) currently says:\n\n|Automatic cherry-pick failed.  After resolving the conflicts,\n|mark the corrected paths with 'git-add <paths>'\n|and commit the result.\n\nThis can obviously be displayed on two lines only.\nWhile at it, change \"git-add\" to \"git add\".\n\nSigned-off-by: Nicolas Pitre <nico@cam.org>\n---\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 2cd9ca5..50c2e18 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -364,7 +364,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\"\n+\t\t\t\"mark the corrected paths with 'git add <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"}]}