mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
Document the --(no-)edit switch of git-revert and git-cherry-pick
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 <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
287f860054
commit
8bf14d6ef9
|
@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit.
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-cherry-pick' [-n] [-r] <commit>
|
'git-cherry-pick' [--edit] [-n] [-r] <commit>
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -20,6 +20,10 @@ OPTIONS
|
||||||
<commit>::
|
<commit>::
|
||||||
Commit to cherry-pick.
|
Commit to cherry-pick.
|
||||||
|
|
||||||
|
--edit::
|
||||||
|
With this option, `git-cherry-pick` will let you edit the commit
|
||||||
|
message prior committing.
|
||||||
|
|
||||||
-r::
|
-r::
|
||||||
Usually the command appends which commit was
|
Usually the command appends which commit was
|
||||||
cherry-picked after the original commit message when
|
cherry-picked after the original commit message when
|
||||||
|
|
|
@ -7,7 +7,7 @@ git-revert - Revert an existing commit.
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-revert' [-n] <commit>
|
'git-revert' [--edit | --no-edit] [-n] <commit>
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -20,6 +20,15 @@ OPTIONS
|
||||||
<commit>::
|
<commit>::
|
||||||
Commit to revert.
|
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::
|
-n::
|
||||||
Usually the command automatically creates a commit with
|
Usually the command automatically creates a commit with
|
||||||
a commit log message stating which commit was reverted.
|
a commit log message stating which commit was reverted.
|
||||||
|
|
|
@ -19,10 +19,10 @@ esac
|
||||||
usage () {
|
usage () {
|
||||||
case "$me" in
|
case "$me" in
|
||||||
cherry-pick)
|
cherry-pick)
|
||||||
die "usage git $me [-n] [-r] <commit-ish>"
|
die "usage git $me [--edit] [-n] [-r] <commit-ish>"
|
||||||
;;
|
;;
|
||||||
revert)
|
revert)
|
||||||
die "usage git $me [-n] <commit-ish>"
|
die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue