git cherry-pick a single commit - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the git cherry-pick command do?

It applies the changes introduced by a specific commit from one branch onto the current branch.

beginner

How do you cherry-pick a single commit with hash abc123?

Use the command git cherry-pick abc123 while on the target branch.

intermediate

What should you do if a conflict occurs during git cherry-pick?

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

intermediate

Can git cherry-pick be used to apply multiple commits at once?

Yes, by specifying a range of commits or multiple commit hashes, but for a single commit, just use its hash.

advanced

What happens if you cherry-pick a commit that is already in the current branch?

Git typically aborts because it would result in an empty commit (changes already present), unless --allow-empty is used to create a duplicate with a new hash, which can cause confusion.

What is the purpose of git cherry-pick?

A To apply a specific commit from another branch to the current branch

B To delete a commit from the history

C To merge two branches automatically

D To create a new branch

git cherry-pick copies changes from a specific commit to your current branch.

Which command applies commit abc123 to your current branch?

A git merge abc123

B git cherry-pick abc123

C git checkout abc123

D git revert abc123

git cherry-pick abc123 applies that commit's changes to your branch.

If a conflict happens during cherry-pick, what is the next step?

A Resolve conflicts manually then run <code>git cherry-pick --continue</code>

B Ignore and continue

C Abort the cherry-pick with <code>git cherry-pick --abort</code>

D Delete the branch

You must fix conflicts and then continue the cherry-pick process.

Can git cherry-pick create duplicate commits?

A No, it prevents duplicates

B Only on merge commits

C Yes, it creates a new commit with a new hash

D Only if you use <code>--force</code>

Cherry-pick creates a new commit with a new hash. If the changes already exist, it aborts (empty commit) unless --allow-empty is used.

Which command aborts a cherry-pick in progress?

A git revert

B git reset --hard

C git merge --abort

D git cherry-pick --abort

git cherry-pick --abort stops the cherry-pick and resets to the previous state.

Explain how to cherry-pick a single commit from another branch and what to do if conflicts occur.

Think about the steps from switching branches to finishing the cherry-pick.

Describe the risks or issues that can happen when cherry-picking commits.

Consider what happens if the same changes exist or conflicts arise.

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