Home Explore Blog CI



git

2nd chunk of `Documentation/git-cherry-pick.adoc`
6750d34a2837a89cc480063c0df7750cb91163afde1083a60000000100000c18
	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 linkgit: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 will cause the cherry-pick to fail.  To force the
	inclusion of those commits, use `--empty=keep`.

--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.

--empty=(drop|keep|stop)::
	How to handle commits being cherry-picked that are redundant with
	changes already in the current history.
+
--
`drop`;;
	The commit will be dropped.
`keep`;;
	The commit will be kept. Implies `--allow-empty`.
`stop`;;
	The cherry-pick will stop when the commit is applied, allowing
	you to examine the commit. This is the default behavior.
--
+
Note that `--empty=drop` and `--empty=stop` only specify how to handle a
commit that was not initially empty, but rather became empty due to a previous
commit. Commits that were initially empty will still cause the cherry-pick to
fail unless one of `--empty=keep` or `--allow-empty` are specified.
+

--keep-redundant-commits::
	Deprecated synonym for `--empty=keep`.

--strategy=<strategy>::
	Use the given merge strategy.  Should only be used once.
	See the

Title: Git Cherry-Pick Options
Summary
The git cherry-pick command provides various options to customize its behavior, including specifying the mainline parent, preventing automatic commits, adding signoff trailers, GPG-signing commits, and handling empty commits and messages, allowing for more control over the cherry-picking process and its resulting commits.