# [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick 3 messages from 2005-11-26 to 2005-12-05. Participants: Petr Baudis, Junio C Hamano. Thread: https://gitlist.dev/t/2685 ## Petr Baudis, 2005-11-26 22:12 Subject: [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick Message-ID: <20051126221244.5131.65509.stgit@machine.or.cz> URL: https://gitlist.dev/e/20051126221244.5131.65509.stgit%40machine.or.cz ``` This switch was not documented properly. I decided not to mention the --no-edit switch in the git-cherry-pick documentation since we always default to no editing. Signed-off-by: Petr Baudis --- Documentation/git-cherry-pick.txt | 6 +++++- Documentation/git-revert.txt | 11 ++++++++++- git-revert.sh | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 26e0467..5e0ef5a 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -7,7 +7,7 @@ git-cherry-pick - Apply the change intro SYNOPSIS -------- -'git-cherry-pick' [-n] [-r] +'git-cherry-pick' [--edit] [-n] [-r] DESCRIPTION ----------- @@ -20,6 +20,10 @@ OPTIONS :: Commit to cherry-pick. +--edit:: + With this option, `git-cherry-pick` will let you edit the commit + message prior committing. + -r:: Usually the command appends which commit was cherry-picked after the original commit message when diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index feebd81..f471037 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -7,7 +7,7 @@ git-revert - Revert an existing commit. SYNOPSIS -------- -'git-revert' [-n] +'git-revert' [--edit | --no-edit] [-n] DESCRIPTION ----------- @@ -20,6 +20,15 @@ OPTIONS :: Commit to revert. +--edit:: + With this option, `git-revert` will let you edit the commit + message prior committing the revert. This is the default if + you run the command from a terminal. + +--no-edit:: + With this option, `git-revert` will not start the commit + message editor. + -n:: Usually the command automatically creates a commit with a commit log message stating which commit was reverted. diff --git a/git-revert.sh b/git-revert.sh index c1aebb1..5cb02b1 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -19,10 +19,10 @@ esac usage () { case "$me" in cherry-pick) - die "usage git $me [-n] [-r] " + die "usage git $me [--edit] [-n] [-r] " ;; revert) - die "usage git $me [-n] " + die "usage git $me [--edit | --no-edit] [-n] " ;; esac } ``` ## Petr Baudis, 2005-12-05 00:25 Subject: Re: [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick Message-ID: <20051205002535.GD22159@pasky.or.cz> URL: https://gitlist.dev/e/20051205002535.GD22159%40pasky.or.cz In-Reply-To: <20051126221244.5131.65509.stgit@machine.or.cz> ``` Dear diary, on Sat, Nov 26, 2005 at 11:12:44PM CET, I got a letter where Petr Baudis said that... > This switch was not documented properly. I decided not to mention > the --no-edit switch in the git-cherry-pick documentation since > we always default to no editing. > > Signed-off-by: Petr Baudis All right, please disregard my previous patch question - I'm sorry, this is the patch I actually wanted to inquire about. ;-) I'll better go get some proper sleep now before I manage to do some worse damage. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't. ``` ## Junio C Hamano, 2005-12-05 00:35 Subject: Re: [PATCH] Document the --(no-)edit switch of git-revert and git-cherry-pick Message-ID: <7vpsoccre2.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vpsoccre2.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20051205002535.GD22159@pasky.or.cz> ``` Petr Baudis writes: > All right, please disregard my previous patch question - I'm sorry, > this is the patch I actually wanted to inquire about. ;-) Ah, thanks for the reminder, and goodnight. ```