{"thread":{"id":"25904","subject":"[PATCH] git-cherry-pick.txt: order options alphabetically","startedAt":"2010-12-01T20:02:55Z","lastAt":"2010-12-01T20:02:55Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157004","messageId":"1291233775-20619-1-git-send-email-jari.aalto@cante.net","threadId":"25904","inReplyTo":null,"subject":"[PATCH] git-cherry-pick.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:02:55Z","receivedAt":"2010-12-01T20:02:55Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-cherry-pick.txt |   57 +++++++++++++++++++------------------\n 1 files changed, 29 insertions(+), 28 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex 3c96fa8..6abde39 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -18,36 +18,16 @@ working tree to be clean (no modifications from the HEAD commit).\n \n OPTIONS\n -------\n-<commit>...::\n-\tCommits to cherry-pick.\n-\tFor a more complete list of ways to spell commits, see\n-\tlinkgit:gitrevisions[7].\n-\tSets of commits can be passed but no traversal is done by\n-\tdefault, as if the '--no-walk' option was specified, see\n-\tlinkgit:git-rev-list[1].\n \n -e::\n --edit::\n \tWith this option, 'git cherry-pick' will let you edit the commit\n \tmessage prior to committing.\n \n--x::\n-\tWhen recording the commit, append to the original commit\n-\tmessage a note that indicates which commit this change\n-\twas cherry-picked from.  Append the note only for cherry\n-\tpicks without conflicts.  Do not use this option if\n-\tyou are cherry-picking from your private branch because\n-\tthe information is useless to the recipient.  If on the\n-\tother hand you are cherry-picking between two publicly\n-\tvisible branches (e.g. backporting a fix to a\n-\tmaintenance branch for an older release from a\n-\tdevelopment branch), adding this information can be\n-\tuseful.\n-\n--r::\n-\tIt used to be that the command defaulted to do `-x`\n-\tdescribed above, and `-r` was to disable it.  Now the\n-\tdefault is not to do `-x` so this option is a no-op.\n+--ff::\n+\tIf the current HEAD is the same as the parent of the\n+\tcherry-pick'ed commit, then a fast forward to this commit will\n+\tbe performed.\n \n -m parent-number::\n --mainline parent-number::\n@@ -70,14 +50,35 @@ OPTIONS\n This is useful when cherry-picking more than one commits'\n effect to your index in a row.\n \n+-r::\n+\tIt used to be that the command defaulted to do `-x`\n+\tdescribed above, and `-r` was to disable it.  Now the\n+\tdefault is not to do `-x` so this option is a no-op.\n+\n -s::\n --signoff::\n \tAdd Signed-off-by line at the end of the commit message.\n \n---ff::\n-\tIf the current HEAD is the same as the parent of the\n-\tcherry-pick'ed commit, then a fast forward to this commit will\n-\tbe performed.\n+-x::\n+\tWhen recording the commit, append to the original commit\n+\tmessage a note that indicates which commit this change\n+\twas cherry-picked from.  Append the note only for cherry\n+\tpicks without conflicts.  Do not use this option if\n+\tyou are cherry-picking from your private branch because\n+\tthe information is useless to the recipient.  If on the\n+\tother hand you are cherry-picking between two publicly\n+\tvisible branches (e.g. backporting a fix to a\n+\tmaintenance branch for an older release from a\n+\tdevelopment branch), adding this information can be\n+\tuseful.\n+\n+<commit>...::\n+\tCommits to cherry-pick.\n+\tFor a more complete list of ways to spell commits, see\n+\tlinkgit:gitrevisions[7].\n+\tSets of commits can be passed but no traversal is done by\n+\tdefault, as if the '--no-walk' option was specified, see\n+\tlinkgit:git-rev-list[1].\n \n EXAMPLES\n --------\n-- \n1.7.2.3\n"}]}