{"thread":{"id":"2685","subject":"[PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick","startedAt":"2005-11-26T22:12:44Z","lastAt":"2005-12-05T00:35:33Z","messageCount":3,"participants":["Petr Baudis","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"12779","messageId":"20051126221244.5131.65509.stgit@machine.or.cz","threadId":"2685","inReplyTo":null,"subject":"[PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-26T22:12:44Z","receivedAt":"2005-11-26T22:12:44Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"This switch was not documented properly. I decided not to mention\nthe --no-edit switch in the git-cherry-pick documentation since\nwe always default to no editing.\n\nSigned-off-by: Petr Baudis <pasky@suse.cz>\n---\n\n Documentation/git-cherry-pick.txt |    6 +++++-\n Documentation/git-revert.txt      |   11 ++++++++++-\n git-revert.sh                     |    4 ++--\n 3 files changed, 17 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex 26e0467..5e0ef5a 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' [-n] [-r] <commit>\n+'git-cherry-pick' [--edit] [-n] [-r] <commit>\n \n DESCRIPTION\n -----------\n@@ -20,6 +20,10 @@ OPTIONS\n <commit>::\n \tCommit to cherry-pick.\n \n+--edit::\n+\tWith this option, `git-cherry-pick` will let you edit the commit\n+\tmessage prior committing.\n+\n -r::\n \tUsually the command appends which commit was\n \tcherry-picked after the original commit message when\ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex feebd81..f471037 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -7,7 +7,7 @@ git-revert - Revert an existing commit.\n \n SYNOPSIS\n --------\n-'git-revert' [-n] <commit>\n+'git-revert' [--edit | --no-edit] [-n] <commit>\n \n DESCRIPTION\n -----------\n@@ -20,6 +20,15 @@ OPTIONS\n <commit>::\n \tCommit to revert.\n \n+--edit::\n+\tWith this option, `git-revert` will let you edit the commit\n+\tmessage prior committing the revert. This is the default if\n+\tyou run the command from a terminal.\n+\n+--no-edit::\n+\tWith this option, `git-revert` will not start the commit\n+\tmessage editor.\n+\n -n::\n \tUsually the command automatically creates a commit with\n \ta commit log message stating which commit was reverted.\ndiff --git a/git-revert.sh b/git-revert.sh\nindex c1aebb1..5cb02b1 100755\n--- a/git-revert.sh\n+++ b/git-revert.sh\n@@ -19,10 +19,10 @@ esac\n usage () {\n \tcase \"$me\" in\n \tcherry-pick)\n-\t\tdie \"usage git $me [-n] [-r] <commit-ish>\"\n+\t\tdie \"usage git $me [--edit] [-n] [-r] <commit-ish>\"\n \t\t;;\n \trevert)\n-\t\tdie \"usage git $me [-n] <commit-ish>\"\n+\t\tdie \"usage git $me [--edit | --no-edit] [-n] <commit-ish>\"\n \t\t;;\n \tesac\n }\n"},{"id":"13193","messageId":"20051205002535.GD22159@pasky.or.cz","threadId":"2685","inReplyTo":"20051126221244.5131.65509.stgit@machine.or.cz","subject":"Re: [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-12-05T00:25:35Z","receivedAt":"2005-12-05T00:25:35Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, Nov 26, 2005 at 11:12:44PM CET, I got a letter\nwhere Petr Baudis <pasky@suse.cz> said that...\n> This switch was not documented properly. I decided not to mention\n> the --no-edit switch in the git-cherry-pick documentation since\n> we always default to no editing.\n> \n> Signed-off-by: Petr Baudis <pasky@suse.cz>\n\nAll right, please disregard my previous patch question - I'm sorry,\nthis is the patch I actually wanted to inquire about. ;-)\n\nI'll better go get some proper sleep now before I manage to do some\nworse damage.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"13195","messageId":"7vpsoccre2.fsf@assigned-by-dhcp.cox.net","threadId":"2685","inReplyTo":"20051205002535.GD22159@pasky.or.cz","subject":"Re: [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-05T00:35:33Z","receivedAt":"2005-12-05T00:35:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Petr Baudis <pasky@suse.cz> writes:\n\n> All right, please disregard my previous patch question - I'm sorry,\n> this is the patch I actually wanted to inquire about. ;-)\n\nAh, thanks for the reminder, and goodnight.\n"}]}