{"thread":{"id":"5314","subject":"[PATCH] revert/cherry-pick: two minor fixes","startedAt":"2006-08-18T04:09:06Z","lastAt":"2006-08-18T04:09:06Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"25515","messageId":"7vk656elct.fsf@assigned-by-dhcp.cox.net","threadId":"5314","inReplyTo":null,"subject":"[PATCH] revert/cherry-pick: two minor fixes","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-08-18T04:09:06Z","receivedAt":"2006-08-18T04:09:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Earlier it was noticed that revert has two seemingly overlapping\noptions, --no-commit and --no-edit.  An ambiguious option,\ne.g. \"--no\", is interpreted as --no-commit.  It was consistent\nbecause the documentation did not advertise the abbreviated\nform, --no-edit, anyway, but that did not change the fact that\nthe case arm to handle --no-edit contained useless choices.\n\nLinus asked to change cherry-pick's default not to record the\noriginal commit object name (i.e. make -r the default).  This\npatch introduces a new option, --record-original, for people who\nmight prefer the command to record it.\n\nSometime in the near future, we would change the default not to\nrecord the original commit, but not yet.\n\nUpdate the documentation to match the above change.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n Documentation/git-cherry-pick.txt |   18 +++++++++++-------\n git-revert.sh                     |    8 ++++++--\n 2 files changed, 17 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex bfa950c..c2a2c27 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change intro\n \n SYNOPSIS\n --------\n-'git-cherry-pick' [--edit] [-n] [-r] <commit>\n+'git-cherry-pick' [--edit] [-n] [--record-original] [-r] <commit>\n \n DESCRIPTION\n -----------\n@@ -24,13 +24,17 @@ OPTIONS\n \tWith this option, `git-cherry-pick` will let you edit the commit\n \tmessage prior committing.\n \n--r|--replay::\n-\tUsually the command appends which commit was\n+--record-original::\n+\tWith this option, the command appends which commit was\n \tcherry-picked after the original commit message when\n-\tmaking a commit.  This option, '--replay', causes it to\n-\tuse the original commit message intact.  This is useful\n-\twhen you are reordering the patches in your private tree\n-\tbefore publishing.\n+\tmaking a commit.\n++\n+This behaviour is still the default, and another option, `-r`,\n+is used to turn it off.  The plan is to make `-r` the default in\n+the near future.\n+\n+-r|--replay::\n+\tSee `--record-original`.\n \n -n|--no-commit::\n \tUsually the command automatically creates a commit with\ndiff --git a/git-revert.sh b/git-revert.sh\nindex 2bf35d1..179135b 100755\n--- a/git-revert.sh\n+++ b/git-revert.sh\n@@ -12,7 +12,8 @@ case \"$0\" in\n *-cherry-pick* )\n \tedit=\n \tme=cherry-pick\n-\tUSAGE='[--edit] [-n] [-r] <commit-ish>'  ;;\n+\treplay=\n+\tUSAGE='[--edit] [-n] [--record-original] <commit-ish>'  ;;\n * )\n \tdie \"What are you talking about?\" ;;\n esac\n@@ -29,12 +30,15 @@ do\n \t-e|--e|--ed|--edi|--edit)\n \t\tedit=-e\n \t\t;;\n-\t--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)\n+\t--no-e|--no-ed|--no-edi|--no-edit)\n \t\tedit=\n \t\t;;\n \t-r|--r|--re|--rep|--repl|--repla|--replay)\n \t\treplay=t\n \t\t;;\n+\t--record-original)\n+\t\treplay=\n+\t\t;;\n \t-*)\n \t\tusage\n \t\t;;\n-- \n1.4.2.gb0ae\n"}]}