{"thread":{"id":"12381","subject":"[PATCH] Documentation cherry-pick: Fix cut-and-paste error","startedAt":"2008-02-29T17:00:38Z","lastAt":"2008-02-29T17:00:38Z","messageCount":1,"participants":["mike ralphson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"70400","messageId":"12043044382624-git-send-email-mike@abacus.co.uk","threadId":"12381","inReplyTo":null,"subject":"[PATCH] Documentation cherry-pick: Fix cut-and-paste error","fromName":"mike ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2008-02-29T17:00:38Z","receivedAt":"2008-02-29T17:00:38Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"From: Mike Ralphson <mike@abacus.co.uk>\n\nSigned-off-by: Mike Ralphson <mike@abacus.co.uk>\n---\n Documentation/git-cherry-pick.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex 877ab66..7e59ab4 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -45,9 +45,9 @@ OPTIONS\n \tdefault is not to do `-x` so this option is a no-op.\n \n -m parent-number|--mainline parent-number::\n-\tUsually you cannot revert a merge because you do not know which\n-\tside of the merge should be considered the mainline.  This\n-\toption specifies the parent number (starting from 1) of\n+\tUsually you cannot cherry-pick a merge because you do not know\n+\twhich side of the merge should be considered the mainline.\n+\tThis option specifies the parent number (starting from 1) of\n \tthe mainline and allows cherry-pick to replay the change\n \trelative to the specified parent.\n \n-- \n1.5.3\n\n\n\n######################################################################\nThis is an e-mail from Abacus Group plc.\nIts contents, including any attachments, are confidential to the\nintended recipient at the e-mail address to which it has been\naddressed. If you are not the intended recipient you must not use,\ndisclose, distribute, copy, or print this e-mail.\nIf you receive this e-mail in error, please notify the sender by reply\ne-mail and delete and destroy the message.\nAll intellectual property rights and materials contained within this\ne-mail are the property of Abacus Group PLC.\nAbacus Group PLC monitors e-mails to ensure its systems operate\neffectively and to minimise the risk of viruses. Whilst it has taken\nreasonable steps to scan this email, it does not accept liability for\nany virus that may be contained in it.\n\nVisit us online at www.abacus-group.co.uk\nEnglish Reg No. 2278260 - Abacus Group plc\n######################################################################\n"}]}