table of contents
GIT-CHERRY-PICK(1) | Git Manual | GIT-CHERRY-PICK(1) |
NAME¶
git-cherry-pick - Apply the change introduced by an existing commit
SYNOPSIS¶
git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>
DESCRIPTION¶
Given one existing commit, apply the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit).
OPTIONS¶
<commit>
Commit to cherry-pick. For a more complete list of ways
to spell commits, see the "SPECIFYING REVISIONS" section in
git-rev-parse(1).
-e, --edit
With this option, git cherry-pick will let you
edit the commit message prior to committing.
-x
When recording the commit, append to the original commit
message a note that indicates which commit this change was cherry-picked from.
Append the note only for cherry picks without conflicts. Do not use this
option if you are cherry-picking from your private branch because the
information is useless to the recipient. If on the other hand you are
cherry-picking between two publicly visible branches (e.g. backporting a fix
to a maintenance branch for an older release from a development branch),
adding this information can be useful.
-r
It used to be that the command defaulted to do -x
described above, and -r was to disable it. Now the default is not to do -x so
this option is a no-op.
-m parent-number, --mainline parent-number
Usually you cannot cherry-pick a merge because you do not
know which side of the merge should be considered the mainline. This option
specifies the parent number (starting from 1) of the mainline and allows
cherry-pick to replay the change relative to the specified parent.
-n, --no-commit
Usually the command automatically creates a commit. This
flag applies the change necessary to cherry-pick the named commit to your
working tree and the index, but does not make the commit. In addition, when
this option is used, your index does not have to match the HEAD commit. The
cherry-pick is done against the beginning state of your index.
This is useful when cherry-picking more than one commits´ effect to your index in a row.
-s, --signoff
Add Signed-off-by line at the end of the commit
message.
--ff
If the current HEAD is the same as the parent of the
cherry-pick’ed commit, then a fast forward to this commit will be
performed.
AUTHOR¶
Written by Junio C Hamano <gitster@pobox.com[1]>
DOCUMENTATION¶
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org[2]>.
GIT¶
Part of the git(1) suite
NOTES¶
- 1.
- gitster@pobox.com
mailto:gitster@pobox.com
- 2.
- git@vger.kernel.org
mailto:git@vger.kernel.org
02/03/2020 | Git 1.7.1 |