Updated on December 10, 2024

git cherry-pick

Estimated reading: 3 minutes 16 views

The git cherry-pick command allows you to apply specific commits from one branch to another. This is useful when you want to incorporate particular changes from one branch (usually the commit history) without merging the entire branch. It can be handy when you need to backport fixes, apply features selectively, or avoid merging large changes from one branch into another.

Optional Commands with git cherry-pick

Here are some additional options that can be used with git cherry-pick:

OptionDescriptionExample
git cherry-pick <commit>Applies the specified commit from another branch.git cherry-pick abc1234
git cherry-pick <commit> <commit2>Applies multiple commits sequentially from another branch.git cherry-pick abc1234 def5678
git cherry-pick --abortCancels the cherry-pick operation and restores the repository to the state before applying the commit.git cherry-pick --abort
git cherry-pick --continueContinues the cherry-pick operation after resolving any conflicts.git cherry-pick --continue
git cherry-pick -nApplies the commit(s) without automatically committing the changes.git cherry-pick -n abc1234

Syntax and Example

				
					# Cherry-pick a single commit from another branch
git cherry-pick abc1234

# Example output:
# [feature-branch abc1234] Commit message
# 1 file changed, 2 insertions(+), 1 deletion(-)

# Cherry-pick multiple commits from another branch
git cherry-pick abc1234 def5678

# Example output:
# [feature-branch abc1234] Commit message
# [feature-branch def5678] Commit message
# 2 files changed, 3 insertions(+), 1 deletion(-)

# Abort the cherry-pick if conflicts occur
git cherry-pick --abort

# Example output:
# error: could not apply abc1234... Commit message
# Reverted commit abc1234

# Continue the cherry-pick after resolving conflicts
git cherry-pick --continue

# Example output:
# [feature-branch abc1234] Commit message
# 1 file changed, 2 insertions(+), 1 deletion(-)

Why Use git cherry-pick?

  • Selective Commit Application: It allows you to apply only specific changes from one branch to another without merging all commits. This is especially useful in situations where you need to port bug fixes or small features between branches.
  • Avoid Merge Overhead: Unlike git merge or git rebase, which may bring in many unwanted changes, git cherry-pick focuses on specific commits, giving you more control over what gets incorporated into your current branch.
  • Backporting: Cherry-picking can be useful for backporting features or bug fixes from a development branch into a release branch.

Conclusion

The git cherry-pick command is a powerful tool for applying specific commits from one branch to another, without merging all changes from the source branch. It is particularly useful when you need to selectively apply fixes or features while maintaining a clean and manageable commit history. Whether you’re backporting changes, applying bug fixes, or working on a selective set of changes, git cherry-pick gives you fine-grained control over your commit history.

Leave a Comment

Share this Doc

git cherry-pick

Or copy link

CONTENTS