How is git cherry-pick different from git merge?

git merge brings in the full history of another branch, while git cherry-pick applies only one specific commit’s diff, leaving the rest of the source branch’s history untouched.

Can I cherry-pick multiple commits at once?

Yes. Pass a range or a list of hashes, for example git cherry-pick abc1234 def5678 , or a range like git cherry-pick abc1234^..def5678 to apply a contiguous sequence of commits.

What happens if git cherry-pick hits a conflict?

Git pauses the operation and reports error: could not apply <hash>... <message> . Resolve the conflict markers in the affected files, stage them with git add , then run git cherry-pick --continue (or git cherry-pick --abort to cancel).

How do I cancel a cherry-pick in progress?

Run git cherry-pick --abort to stop the operation and return the branch to the state it was in before the cherry-pick started.

Git is usually about managing streams of history. You merge rivers of code together. But sometimes, you don’t want the whole river. You just want one specific fish.

That’s git cherry-pick.

What Is Git Cherry-Pick?

Q: What does git cherry-pick do?

Git cherry-pick takes the changes introduced by a single specified commit and applies them to the current branch as a new commit with a new SHA, without merging the rest of that commit’s branch history.

Git cherry-pick is a Git command that takes the changes from a single specified commit and applies them to the current branch as a new commit, without merging the rest of that commit’s branch history.

Git cherry-pick is highly useful in specific scenarios:

Hotfixes: You fixed a bug in dev, and you need that same fix in prod right now, but you can’t merge dev yet because it has unfinished features.
Mistakes: You committed to the wrong branch.

How to Use Git Cherry-Pick: Step-by-Step Workflow

🔒 Subscribe to keep reading.

Resolving Git Cherry-Pick Conflicts

🔒 Subscribe to keep reading.

When Not to Use Git Cherry-Pick: Merge and Rebase Alternatives

🔒 Subscribe to keep reading.

Git Cherry-Pick: Definitive Use Case Summary

🔒 Subscribe to keep reading.

You've hit a Deep Dive tutorial.

I spend dozens of hours researching, coding, and breaking things to write these guides. This content is free, but reserved for my subscriber community. Drop your email below to unlock this guide (and all past/future deep dives):

Already a subscriber? Use the magic link from your last newsletter, or reset your password.

New subscribers get an inbox mail: Set a password to unlock articles. The form does not log you in — use the same email afterwards.

Git Cherry-Pick: The Surgeon's Knife

📚 This post is part of the "Git Survival Guide" series

What Is Git Cherry-Pick?

How to Use Git Cherry-Pick: Step-by-Step Workflow

Resolving Git Cherry-Pick Conflicts

When Not to Use Git Cherry-Pick: Merge and Rebase Alternatives

Git Cherry-Pick: Definitive Use Case Summary

References

Citation

Git Cherry-Pick: The Surgeon's Knife

📚 This post is part of the "Git Survival Guide" series

What Is Git Cherry-Pick?

How to Use Git Cherry-Pick: Step-by-Step Workflow

Resolving Git Cherry-Pick Conflicts

When Not to Use Git Cherry-Pick: Merge and Rebase Alternatives

Git Cherry-Pick: Definitive Use Case Summary

You're in

References

Citation