-
<commit>…
-
Commits to cherry-pick.
For a more complete list of ways to spell commits, see
gitrevisions(7).
Sets of commits can be passed but no traversal is done by
default, as if the --no-walk option was specified, see
git-rev-list(1). Note that specifying a range will
feed all <commit>… arguments to a single revision walk
(see a later example that uses maint master..next).
-
-e
-
--edit
-
With this option, git cherry-pick will let you edit the commit
message prior to committing.
-
--cleanup=<mode>
-
This option determines how the commit message will be cleaned up before
being passed on to the commit machinery. See git-commit(1) for more
details. In particular, if the <mode> is given a value of scissors,
scissors will be appended to MERGE_MSG before being passed on in the case
of a conflict.
-
-x
-
When recording the commit, append a line that says
"(cherry picked from commit …)" to the original commit
message in order to indicate which commit this change was
cherry-picked from. This is done 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 sequence of commits.
This flag applies the changes necessary to cherry-pick
each named commit to your working tree and the index,
without making any 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 a Signed-off-by trailer at the end of the commit message.
See the signoff option in git-commit(1) for more information.
-
-S[<keyid>]
-
--gpg-sign[=<keyid>]
-
--no-gpg-sign
-
GPG-sign commits. The keyid argument is optional and
defaults to the committer identity; if specified, it must be
stuck to the option without a space. --no-gpg-sign is useful to
countermand both commit.gpgSign configuration variable, and
earlier --gpg-sign.
-
--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.
-
--allow-empty
-
By default, cherry-picking an empty commit will fail,
indicating that an explicit invocation of git commit
--allow-empty is required. This option overrides that
behavior, allowing empty commits to be preserved automatically
in a cherry-pick. Note that when "--ff" is in effect, empty
commits that meet the "fast-forward" requirement will be kept
even without this option. Note also, that use of this option only
keeps commits that were initially empty (i.e. the commit recorded the
same tree as its parent). Commits which are made empty due to a
previous commit are dropped. To force the inclusion of those commits
use --keep-redundant-commits.
-
--allow-empty-message
-
By default, cherry-picking a commit with an empty message will fail.
This option overrides that behavior, allowing commits with empty
messages to be cherry picked.
-
--keep-redundant-commits
-
If a commit being cherry picked duplicates a commit already in the
current history, it will become empty. By default these
redundant commits cause cherry-pick to stop so the user can
examine the commit. This option overrides that behavior and
creates an empty commit object. Implies --allow-empty.
-
--strategy=<strategy>
-
Use the given merge strategy. Should only be used once.
See the MERGE STRATEGIES section in git-merge(1)
for details.
-
-X<option>
-
--strategy-option=<option>
-
Pass the merge strategy-specific option through to the
merge strategy. See git-merge(1) for details.
-
--rerere-autoupdate
-
--no-rerere-autoupdate
-
After the rerere mechanism reuses a recorded resolution on
the current conflict to update the files in the working
tree, allow it to also update the index with the result of
resolution. --no-rerere-autoupdate is a good way to
double-check what rerere did and catch potential
mismerges, before committing the result to the index with a
separate git add.