Pick single or multiple commits

Cherry-pick one commit

git cherry-pick 

Example:

git cherry-pick a1b2c3d d4e5f6g

Cherry-pick a range

git cherry-pick old^..new

Example:

git log --oneline

Handle conflicts

Continue after conflict resolution

git add .
git cherry-pick --continue

Example:

git cherry-pick --abort

Skip problematic commit

git cherry-pick --skip

Example:

git status

Audit picked commits

Show picked commit metadata

git show HEAD

Example:

git log --oneline --decorate

Append source reference

git cherry-pick -x 

Example:

git log --grep="cherry picked"

Common mistakes / Errores comunes

  • Cherry-picking dependent commits without prerequisites can break builds.
  • Repeated cherry-picks across branches create duplicate commit history.
  • For large feature sync, merge or rebase is often cleaner than many picks.
Last updated: February 2026