git cherry-pick a single commit - Commands & Configuration

Introduction

Sometimes you want to take a specific change from one branch and add it to another without merging everything. Git cherry-pick lets you copy a single commit from one branch to your current branch.

When you fixed a bug in a feature branch and want to apply just that fix to the main branch without merging all changes.

When you want to add a specific feature or update from another branch without bringing in unrelated commits.

When you accidentally committed a change to the wrong branch and want to move it to the correct one.

When you want to test a single commit from another branch in your current branch before merging.

When you want to backport a fix from the latest version branch to an older release branch.

Commands

Switch to the branch where you want to apply the commit. Here, we switch to the main branch.

Terminal

git checkout main

Expected Output

Switched to branch 'main'

Apply the single commit with hash 3a1b2c4 from another branch onto the current branch.

Terminal

git cherry-pick 3a1b2c4

Expected Output

[main 9f8e7d6] Fix typo in README

 Author: Jane Doe <[e-mail]>

 Date:   Thu Apr 25 10:00:00 2024 +0000



    README typo fixed

Check the latest commit on the current branch to confirm the cherry-pick was successful.

Terminal

git log -1

Expected Output

commit 9f8e7d6b1234567890abcdef1234567890abcdef

Author: Jane Doe <[e-mail]>

Date:   Thu Apr 25 10:00:00 2024 +0000



    Fix typo in README

Key Concept

If you remember nothing else from this pattern, remember: git cherry-pick copies a single commit from another branch onto your current branch without merging all changes.

Common Mistakes

Trying to cherry-pick a commit without switching to the target branch first.

The commit will be applied to the wrong branch, causing confusion and potential conflicts.

Always switch to the branch where you want the commit before running git cherry-pick.

Using an incorrect or incomplete commit hash.

Git will return an error saying it cannot find the commit.

Use the full or unique prefix of the commit hash exactly as shown by git log.

Ignoring conflicts that occur during cherry-pick.

Conflicts stop the cherry-pick process and must be resolved before continuing.

Resolve conflicts manually, then run git cherry-pick --continue to finish.

Summary

Switch to the branch where you want to add the commit using git checkout.

Run git cherry-pick with the commit hash to copy that single commit.

Verify the commit was added by checking the latest commit with git log -1.

Practice

1. What does the git cherry-pick command do?

easy

A. Creates a new branch from the current commit

B. Deletes a commit from the current branch

C. Merges two branches completely

D. Copies a specific commit from another branch to the current branch

Solution

1. Step 1: Understand the purpose of git cherry-pick

   The command is used to copy a single commit from one branch to another without merging all changes.

2. Step 2: Compare with other git commands

   Unlike merge, cherry-pick applies only one commit, not the entire branch history.

3. Final Answer:

   Copies a specific commit from another branch to the current branch -> Option D

4. Quick Check:

   git cherry-pick = copy single commit [OK]

Hint: Cherry-pick copies one commit, not whole branch [OK]

Common Mistakes:

• Confusing cherry-pick with merge
• Thinking it deletes commits
• Assuming it creates branches

2. Which of the following is the correct syntax to cherry-pick a commit with hash abc123?

easy

A. git cherry-pick abc123

B. git cherry-pick -m abc123

C. git cherry-pick --commit abc123

D. git cherry-pick commit abc123

Solution

1. Step 1: Recall the basic cherry-pick syntax

   The command is git cherry-pick <commit-hash> to apply a single commit.

2. Step 2: Check the options given

   Only git cherry-pick abc123 matches the correct syntax without extra or incorrect flags.

3. Final Answer:

   git cherry-pick abc123 -> Option A

4. Quick Check:

   Correct syntax = git cherry-pick commit_hash [OK]

Hint: Use git cherry-pick followed by commit hash [OK]

Common Mistakes:

• Adding unnecessary flags
• Using incorrect keywords like 'commit'
• Confusing with merge options

3. Given the following commands run on branch main:

git checkout main
git cherry-pick 1a2b3c4

What will happen after these commands?

medium

A. The commit with hash 1a2b3c4 is applied to main branch

B. A new branch named 1a2b3c4 is created

C. The main branch is reset to commit 1a2b3c4

D. The commit 1a2b3c4 is deleted from the repository

Solution

1. Step 1: Understand the effect of git cherry-pick

   Running git cherry-pick 1a2b3c4 applies that commit's changes onto the current branch, here main.

2. Step 2: Analyze other options

   No new branch is created, no reset happens, and commits are not deleted by cherry-pick.

3. Final Answer:

   The commit with hash 1a2b3c4 is applied to main branch -> Option A

4. Quick Check:

   Cherry-pick applies commit to current branch [OK]

Hint: Cherry-pick applies commit changes to current branch [OK]

Common Mistakes:

• Thinking it creates branches
• Confusing cherry-pick with reset
• Assuming it deletes commits

4. You run git cherry-pick abcdef but get a conflict error. What should you do next?

medium

A. Abort the cherry-pick with git cherry-pick --abort and try again

B. Manually resolve the conflicts, then run git cherry-pick --continue

C. Delete the conflicting files and commit

D. Run git reset --hard to fix the conflict

Solution

1. Step 1: Understand conflict during cherry-pick

   Conflicts mean git cannot automatically apply changes; manual resolution is needed.

2. Step 2: Resolve conflicts and continue

   After fixing conflicts in files, run git cherry-pick --continue to finish applying the commit.

3. Final Answer:

   Manually resolve the conflicts, then run git cherry-pick --continue -> Option B

4. Quick Check:

   Resolve conflicts + git cherry-pick --continue [OK]

Hint: Fix conflicts, then run git cherry-pick --continue [OK]

Common Mistakes:

• Aborting without trying to fix
• Deleting files instead of resolving
• Using reset which discards changes

5. You want to apply a commit from branch feature to main without merging all changes. The commit hash is f1e2d3c. Which sequence of commands correctly does this?

hard

A. git checkout main
git merge f1e2d3c

B. git checkout feature
git cherry-pick f1e2d3c
git checkout main

C. git checkout main
git cherry-pick f1e2d3c

D. git checkout main
git rebase feature

Solution

1. Step 1: Switch to the target branch

   You must be on main to apply the commit there.

2. Step 2: Cherry-pick the specific commit

   Run git cherry-pick f1e2d3c to copy that commit from feature branch.

3. Step 3: Analyze other options

   Switching to feature, cherry-picking there, then switching back to main does not apply the commit to main, as cherry-pick affects the current branch. Merge and rebase apply entire branches, not a single commit.

4. Final Answer:

   git checkout main git cherry-pick f1e2d3c -> Option C

5. Quick Check:

   Checkout target branch + cherry-pick commit [OK]

Hint: Checkout target branch first, then cherry-pick commit [OK]

Common Mistakes:

• Cherry-picking on wrong branch
• Using merge or rebase instead of cherry-pick
• Not switching branches before cherry-pick