11. Cherry-Pick

Apply a specific commit from one branch to another — without merging the whole branch.

git switch main
git cherry-pick a1b2c3           # apply one commit
git cherry-pick a1b2c3 d4e5f6    # apply multiple commits (oldest first)
git cherry-pick main~3..main     # apply a range

# If conflict
git cherry-pick --continue       # after resolving
git cherry-pick --abort          # cancel entirely
git cherry-pick --skip           # skip this commit, continue range

# Cherry-pick without committing (stage only)
git cherry-pick -n a1b2c3

Real-world uses:

• Backport a bug fix to an older release branch
• Grab a feature from a stale branch that won't be merged
• Pull a specific commit out of a messy branch

---