Git Cherry Pick

Sometimes you do not want a full merge. You only need one commit from another branch, for example a bug fix. The git cherry-pick command copies a commit and applies it on your current branch as a new commit.

Syntax

git cherry-pick <commit>
git cherry-pick <commit1> <commit2>
git cherry-pick <start>..<end>
git cherry-pick -x <commit>
git cherry-pick --no-commit <commit>

Example

The branch develop has three commits. Only the footer fix is needed now on main, because we want to release it today.

The “Fix footer bug” commit is the second from the top, which is develop~1.

Only the fix came to main. The other two commits are not in main. Notice that the commit has a different hash than the original, because it is a new commit.

Useful options

Option	Meaning
-x	Adds “(cherry picked from commit …)” to the message, helpful in hotfix branches
-n or --no-commit	Apply the changes but do not commit, so you can change them
-e	Edit the message of the new commit
--continue / --abort	Continue or cancel after a conflict

Cherry-pick a range

git cherry-pick A..B
git cherry-pick A^..B

A..B does not include the commit A. A^..B includes both A and B.

If there is a conflict

Like a merge, Git stops when the same lines differ. Solve the conflict, run git add, and continue:

git cherry-pick --continue
git cherry-pick --abort

When to use it

• Take a hotfix from develop to a release branch.
• You committed to the wrong branch. Cherry-pick it to the right one, then remove it from the wrong one.
• Take a single useful commit from a branch which will not be merged.

• Previous Page
• Next Page

---

Exercises & Assignments
No Content Found.

Interview Questions & Answers
No Content Found.