git-cherry-pick

Apply commit to current branch

$ git cherry-pick [commit]

$ git cherry-pick [commit1] [commit2]

$ git cherry-pick [start]..[end]

$ git cherry-pick -n [commit]

$ git cherry-pick --continue

$ git cherry-pick --abort

$ git cherry-pick -e [commit]

git cherry-pick [options] commit...

git cherry-pick applies the changes introduced by existing commits onto the current branch, creating new commits with the same diff but different ancestry. This allows selective integration of specific changes without merging entire branches.
The command is essential for backporting bug fixes to maintenance branches, incorporating specific features from development branches, and recovering commits from abandoned branches. Each cherry-picked commit gets a new SHA-1 hash reflecting its new parent.
Cherry-picking can encounter conflicts when changes don't apply cleanly to the target branch's context. The operation can be paused, and conflicts resolved manually before continuing. The -x option appends a "cherry picked from commit" note to track the original source, useful for auditing backports.

-n, --no-commit

Apply without committing.

Edit commit message.

Append "cherry picked from" note.

Mainline parent for merge commits.

Continue after resolving conflicts.

Cancel operation.

Skip current commit.

git-rebase(1), git-revert(1)