Git Notes
HubBenefits of Git and GitHub - Why They MatterGit vs GitHubVersion Control SystemWhat Is GitWhat Is GitHubConfigure Git - User Identity and SettingsCreate GitHub Account - Sign Up GuideFirst Git Repository - Getting StartedInstall Git on Linux - Complete Setup GuideInstall Git on macOS - Installation GuideInstall Git on Windows - Step-by-Step GuideGit Add - Stage ChangesGit Clone - Copy Remote Repositories LocallyGit Commit - Save ChangesGit Diff - Compare Changes in Your RepositoryGit Ignore - Exclude Files from Version ControlGit Init - Initialize RepositoryGit Log - View Commit HistoryGit Status - Check Repository StateGit Fetch - Download Remote Changes Without MergingGit Pull - Fetch and Merge Remote ChangesGit Push - Upload Local Commits to Remote RepositoryGit Remote - Manage Remote Repository ConnectionsLocal Repository - Understanding Your Git Working EnvironmentRemote Repository - Collaborate Through Shared RepositoriesSync Local and Remote - Keep Repositories in HarmonyAmend Commit - Fix Last CommitDelete Branch - Clean Up BranchesGit Reset - Move HEAD and Undo CommitsGit Restore - Discard ChangesGit Revert - Safely Undo ChangesRecover Lost Commits - Reflog GuideFork RepositoryGitHub PagesGitHub Profile SetupGitHub RepositoriesGitHub Stars and WatchersRepository SettingsCode ReviewsGit CloneGit FetchGit PullGit PushGitHub IssuesLabels and MilestonesOpen Source ContributionsGitHub Project BoardsPull Requests - Propose and Review Code ChangesTeam Collaboration with Git and GitHubAutomated Testing with GitHub ActionsCI/CD with GitHub ActionsDeployment Automation with GitHub ActionsIntroduction to GitHub ActionsGitHub Actions RunnersGitHub Actions WorkflowsEnterprise Git Workflows - Scale Git for Large OrganizationsFeature Branch Workflow - Isolate Development WorkGitFlow Workflow - Structured Release ManagementMonorepo Workflow - Manage Multiple Projects in One RepositoryTrunk-Based Development - Ship Code Fast and SafelyDeployment WorkflowsGitHub Pages DeploymentNetlify Deployment from GitHubRender Deployment from GitHubVercel Deployment from GitHubBranch Protection Rules - Secure Your Git BranchesPersonal Access Tokens - Authenticate with GitHubRepository Security Best PracticesSecret Scanning - Detect Leaked Credentials in CodeSigned Commits - Verify Commit Authenticity with GPGSSH Keys - Secure Git Authentication Without PasswordsGit Bisect - Find Bugs with Binary SearchGit Cherry-Pick - Apply Specific Commits to Any BranchGit Hooks - Automate Workflows with Git EventsGit Internals - Understanding How Git Works Under the HoodGit Stash - Temporarily Save Uncommitted ChangesGit Submodules - Manage External Dependencies as Git ReposGit Tag - Mark Important Points in HistoryGit Worktrees - Work on Multiple Branches SimultaneouslyCollaborative Web App ProjectComplete Team Workflow ProjectGitHub Actions Project - Build a CI/CD PipelineOpen Source Project Contribution - Guided ExercisePortfolio Project with Git - Showcase Your SkillsGit Command CheatsheetGit Interview Questions - Comprehensive Preparation GuideGitHub Interview QuestionsScenario-Based Git Interview QuestionsGit Troubleshooting GuideGit Best Practices - Professional Development HabitsCommon Git Errors and Fixes - Quick SolutionsGit Command Reference - Complete Command GuideLearning Resources - Continue Your Git & GitHub EducationBranch Strategies - Choosing the Right Git Branching ModelCreate Branch in Git - Start New Development LinesFast-Forward Merge in Git - Clean Linear HistoryGit BranchGit CheckoutGit MergeGit RebaseMerge Branches in Git - Combine Development WorkMerge Conflicts - Resolve Git Conflicts Like a ProSwitch Branch in Git - Navigate Between Branches
Learn how to use git cherry-pick to apply individual commits from one branch to another. Master cherry-pick options, conflict resolution, and best practices.
Git cherry-pick lets you apply the changes from a specific commit onto your current branch. Unlike merging (which brings all commits from a branch), cherry-pick lets you selectively choose individual commits.
How Cherry-Pick Works
Example
Before cherry-pick:
main [A]──[B]──[C]
\
feature [D]──[E]──[F]
↑
Want this commit on main
After: git checkout main && git cherry-pick E
main [A]──[B]──[C]──[E']
\
feature [D]──[E]──[F]
Cherry-pick creates a NEW commit (E') with the same changes as E but a different SHA hash.
Basic Cherry-Pick
bash example
# Switch to the branch where you want the commit
git checkout main
# Apply a specific commit by its hash
git cherry-pick abc1234Output
[main f7e8d9c] Add input validation for email field Date: Mon Jan 15 10:30:00 2024 1 file changed, 15 insertions(+), 2 deletions(-)
Step-by-Step Example
bash example
# View commit log of another branch to find the commit you want
git log feature/auth --onelineOutput
e5f6g7h (feature/auth) Add session timeout d4e5f6g Add password hashing c3d4e5f Add login endpoint b2c3d4e Set up auth middleware
bash example
# Cherry-pick the password hashing commit to main
git checkout main
git cherry-pick d4e5f6gOutput
[main a1b2c3d] Add password hashing Author: Jane Doe <jane@example.com> Date: Tue Jan 16 14:00:00 2024 1 file changed, 23 insertions(+), 5 deletions(-)
Cherry-Pick Multiple Commits
Individual Commits
bash example
git cherry-pick abc1234 def5678 ghi9012Range of Commits
bash example
# Cherry-pick commits from B to E (B is exclusive, E is inclusive)
git cherry-pick B..E
# Include B as well
git cherry-pick B^..EExample with Range
bash example
# Apply commits c3d4e5f through e5f6g7h
git cherry-pick c3d4e5f^..e5f6g7hOutput
[main 111aaaa] Add login endpoint [main 222bbbb] Add password hashing [main 333cccc] Add session timeout
Cherry-Pick Options
Apply Without Committing
bash example
git cherry-pick --no-commit abc1234
# or
git cherry-pick -n abc1234Changes are staged but not committed. Useful for combining multiple cherry-picks into one commit:
bash example
git cherry-pick -n commit1
git cherry-pick -n commit2
git cherry-pick -n commit3
git commit -m "Backport: security fixes from feature branch"Edit Commit Message
bash example
git cherry-pick -e abc1234
# Opens editor to modify the commit messageAppend Cherry-Pick Info to Message
bash example
git cherry-pick -x abc1234Adds a line like (cherry picked from commit abc1234...) to the commit message.
Keep Original Author
By default, cherry-pick preserves the original author. The committer changes to you:
bash example
git log --format="%an (author) | %cn (committer)" -1Output
Jane Doe (author) | You (committer)
Handling Cherry-Pick Conflicts
bash example
git cherry-pick abc1234Output
Auto-merging src/app.js CONFLICT (content): Merge conflict in src/app.js error: could not apply abc1234... Add feature hint: After resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git cherry-pick --continue'
Resolve and Continue
bash example
# Fix conflicts in the file
vim src/app.js
# Stage resolved file
git add src/app.js
# Continue cherry-pick
git cherry-pick --continueAbort Cherry-Pick
bash example
git cherry-pick --abortSkip Current Commit
bash example
git cherry-pick --skipCommon Use Cases
Backporting a Bug Fix
bash example
# Fix was made on develop, need it on release branch
git checkout release/v2.0
git cherry-pick abc1234 # The bug fix commit from developHotfix to Production
bash example
# Apply critical fix to main without merging entire feature branch
git checkout main
git cherry-pick fix-commit-hash
git push origin main
# Deploy immediatelyRecovering Work from a Deleted Branch
bash example
# Find the commit hash from reflog
git reflog | grep "important work"
# Cherry-pick it to current branch
git cherry-pick recovered-commit-hashSelective Feature Deployment
bash example
# Only deploy parts of a feature that are ready
git checkout deploy
git cherry-pick feature-part1-commit
git cherry-pick feature-part3-commit
# Skip part 2 which is not readyCherry-Pick vs Other Approaches
| Approach | Use Case | Creates New Commits |
|---|---|---|
| Cherry-pick | Specific commits to another branch | Yes (new SHAs) |
| Merge | All commits from a branch | Yes (merge commit) |
| Rebase | Move entire branch to new base | Yes (new SHAs) |
| Patch | Share changes without Git connection | Via git apply |
Best Practices
- Use
-xflag to track where cherry-picks came from - Avoid cherry-picking merge commits — they are complex and error-prone
- Cherry-pick is not a substitute for merging — use it sparingly
- Watch for duplicate changes — cherry-picked commits will conflict when branches merge later
- Prefer merging or rebasing when you need all changes from a branch
Interview Questions
- What is git cherry-pick and when would you use it?
Cherry-pick applies the changes from a specific commit to your current branch, creating a new commit. Use it for backporting fixes, applying hotfixes to production, or selectively applying changes without merging an entire branch.
- Does cherry-pick change the original commit?
No, the original commit remains unchanged on its branch. Cherry-pick creates a new commit with the same changes but a different SHA hash on the target branch.
- What problems can cherry-picking cause during later merges?
When the original branch is eventually merged, Git may detect duplicate changes and create conflicts. The same logical change exists in two commits with different SHAs, which can confuse merge algorithms.
- How do you cherry-pick a merge commit?
Use git cherry-pick -m 1 <merge-commit> where -m 1 specifies which parent to use as the mainline. However, this is complex and generally discouraged.
- How do you cherry-pick multiple commits without creating separate commits?
Use git cherry-pick --no-commit commit1 commit2 commit3 then git commit once. This stages all changes without committing, letting you create a single combined commit.
Exam Focus
Revise definitions, diagrams, examples, and short-answer points for Git Cherry-Pick - Apply Specific Commits to Any Branch.
Interview Use
Prepare one clear explanation, one practical example, and one common mistake for this Git & GitHub topic.
Search Terms
git-github, git & github, git, github, advanced, cherry, pick, git cherry-pick - apply specific commits to any branch
Related Git & GitHub Topics
Continue learning this concept
Advanced GitGit Bisect - Find Bugs with Binary SearchLearn how to use git bisect to efficiently find the commit that introduced a bug using binary search. Master automated bisect with scripts and practical debugging workflows.Advanced GitGit Hooks - Automate Workflows with Git EventsLearn to use Git hooks for automating code quality checks, commit message validation, pre-push testing, and deployment triggers. Covers client-side and server-side hooks.Advanced GitGit Internals - Understanding How Git Works Under the HoodDeep dive into Git internals including objects (blobs, trees, commits), the SHA-1 hash system, packfiles, refs, and how Git stores data as a content-addressable filesystem.Advanced GitGit Stash - Temporarily Save Uncommitted ChangesMaster git stash to save work-in-progress changes without committing. Learn stash operations, named stashes, partial stashing, and workflow patterns.Advanced GitGit Submodules - Manage External Dependencies as Git ReposLearn how to use Git submodules to include external repositories within your project. Cover adding, updating, cloning with submodules, and alternatives.Advanced GitGit Tag - Mark Important Points in HistoryLearn how to create, list, and manage Git tags for releases and milestones. Understand lightweight vs annotated tags, semantic versioning, and tag workflows.