Interface CherryPickOptions

CherryPickOptions defines the supported options for the Git cherry-pick command.

Hierarchy

  • CherryPickOptions

Properties

--abort? --allow-empty? --allow-empty-message? --cleanup? --continue? --ff? --gpg-sign? --keep-redundant-commits? --mainline? --no-commit? --no-gpg-sign? --no-rerere-autoupdate? --quit? --rerere-autoupdate? --signoff? --skip? --strategy? --strategy-option? -x?

Properties

Optional --abort

--abort?: null

Aborts the current conflict resolution process, and attempts to reconstruct the pre-merge state.

Optional --allow-empty

--allow-empty?: null

Permits cherry-picking an empty commit.

Optional --allow-empty-message

--allow-empty-message?: null

Permits cherry-picking a commit with an empty message.

Optional --cleanup

--cleanup?: string

Determines how the merge message will be cleaned up before committing.

Optional --continue

--continue?: null

Concludes the merge once conflicts are resolved.

Optional --ff

--ff?: null

Resolves the merge as a fast-forward when possible.

Optional --gpg-sign

--gpg-sign?: null | string

GPG-sign commits. See also --no-gpg-sign.

Optional --keep-redundant-commits

--keep-redundant-commits?: null

Creates an empty commit object when a commit being cherry picked duplicates a commit already in the current history.

Optional --mainline

--mainline?: string | number

Specifies the parent number (starting from 1) of the mainline.

Optional --no-commit

--no-commit?: null

Performs the cherry-pick and stops just before creating any commit.

Optional --no-gpg-sign

--no-gpg-sign?: null

The complement of --gpg-sign.

Optional --no-rerere-autoupdate

--no-rerere-autoupdate?: null

The complement of --rerere-autoupdate.

Optional --quit

--quit?: null

Abandons the the current merge in progress, leaving the index and the working tree as-is.

Optional --rerere-autoupdate

--rerere-autoupdate?: null

Allows the rerere mechanism to update the index with the result of auto-conflict resolution. See also --no-rerere-autoupdate.

Optional --signoff

--signoff?: null

Adds a Signed-off-by trailer by the committer at the end of the commit log message.

Optional --skip

--skip?: null

Skips the current commit and continues with the rest of the sequence.

Optional --strategy

--strategy?: string

Uses the given merge strategy.

Optional --strategy-option

--strategy-option?: string

Passes merge strategy-specific option through to the merge strategy.

Optional -x

-x?: null

Appends a line that says "(cherry picked from commit...)" to the original commit message.

Settings

Member Visibility

Theme

On This Page