Stashing and Cherry-picking Changes
Master `git stash` to temporarily save changes and `git cherry-pick` to apply specific commits across branches.
Stashing and Cherry-picking Changes is a free Git Advanced: Monorepo, Submodules & Workflows lesson on CoddyKit — lesson 2 of 4. You can read the complete lesson below for free — then practise it hands-on in the browser with a built-in code editor and a 24/7 AI tutor. It is part of the Git Advanced: Monorepo, Submodules & Workflows learning path, one of 4 lessons in the course, and your progress syncs across the web and the CoddyKit app.
Why Use Git Stash?
Mid-feature and an urgent bug fix lands? git stash temporarily shelves your uncommitted changes so you can switch branches without committing half-done work.
Saving Your Changes Temporarily
Run git stash to save your modified and staged changes, then Git resets your working directory to a clean HEAD. Your work is safely tucked away.
git status
# On branch feature-x
# Changes to be committed:
# new file: new_feature.txt
# Changes not staged for commit:
# modified: index.html
git stash
# Saved working directory and index state WIP on feature-x: ...
# HEAD is now at ...
git status
# On branch feature-x
# nothing to commit, working tree cleanViewing Your Stash Stack
You can hold multiple stashes. git stash list shows them all, each indexed — stash@{0} being the most recent.
git stash list
# stash@{0}: WIP on feature-x: ...
# stash@{1}: WIP on bugfix-branch: ...Bringing Stash Back: Apply
git stash apply restores your most recent stash into the working directory. Want an older one? Name it, like git stash apply stash@{1}.
git checkout bugfix-branch
git stash apply stash@{1}
# On branch bugfix-branch
# Changes not staged for commit:
# modified: bug.jsApply vs. Pop: What's the Difference?
apply vs pop: apply restores changes but keeps the stash in the list; pop restores them and removes the stash. Use pop when you're done with it.
git stash list
# stash@{0}: WIP on feature-x: ...
git stash pop
# On branch feature-x
# Changes not staged for commit:
# modified: index.html
# Dropped stash stash@{0} (...
git stash list
# (empty output, stash is gone)Cleaning Up Stashes
Clean up stashes you no longer need: git stash drop <id> removes one, git stash clear removes all. Clear can't be undone, so be careful.
git stash list
# stash@{0}: WIP on feature-x: ...
# stash@{1}: WIP on old-bug: ...
git stash drop stash@{1}
# Dropped stash stash@{1} (...
git stash list
# stash@{0}: WIP on feature-x: ...Introducing Git Cherry-Pick
Need just one commit from another branch, not its whole history? git cherry-pick applies a single commit's changes onto your current branch.
Applying a Single Commit
Find the commit hash with git log --oneline, switch to your target branch, then git cherry-pick <hash> to bring just that change over.
git log --oneline
# a1b2c3d Fix: Critical typo in header
# e4f5g6h Feat: Add user profiles
git checkout main
# Switched to branch 'main'
git cherry-pick a1b2c3d
# [main] Fix: Critical typo in header
# 1 file changed, 1 insertion(+), 1 deletion(-)Resolving Cherry-Pick Conflicts
Cherry-picking can conflict like a merge. Resolve manually, git add the files, then git cherry-pick --continue — or --abort to cancel.
git cherry-pick a1b2c3d
# Auto-merging header.js
# CONFLICT (content): Merge conflict in header.js
# error: could not apply a1b2c3d...
# (Resolve conflicts, then:)
git add header.js
git cherry-pick --continueStash & Cherry-Pick Quiz
You are on the feature-A branch, with uncommitted changes. An urgent fix needs to go into main. You stash your changes, switch to main, and fix the bug with a commit (hash: 789abc). Now you want to apply this fix to feature-A and return to your work.
Lesson Summary
Recap: git stash shelves uncommitted work so you can switch branches cleanly, and git cherry-pick grabs a single commit from one branch onto another.
Frequently asked questions
Is the “Stashing and Cherry-picking Changes” lesson free?
Yes — the full text of “Stashing and Cherry-picking Changes” is free to read here on the web, and the Git Advanced: Monorepo, Submodules & Workflows course includes 4 lessons in total. To practise it interactively (a built-in code editor and a 24/7 AI tutor) and unlock the rest of the Git Advanced: Monorepo, Submodules & Workflows course, upgrade to CoddyKit PRO.
What will I learn in “Stashing and Cherry-picking Changes”?
Master `git stash` to temporarily save changes and `git cherry-pick` to apply specific commits across branches. You practise Git Advanced: Monorepo, Submodules & Workflows with hands-on code you run directly in the browser, and a 24/7 AI tutor answers your questions as you work through the lesson.
Do I need any experience to start Git Advanced: Monorepo, Submodules & Workflows?
No prior experience is required. Git Advanced: Monorepo, Submodules & Workflows on CoddyKit is structured for beginners through advanced learners; this is — lesson 2 of 4, so you can start here or from the beginning and move at your own pace.
How long does the “Stashing and Cherry-picking Changes” lesson take?
Most CoddyKit lessons take about 5–10 minutes. Each one is bite-sized and interactive, so you make steady progress and pick up exactly where you left off across the web and the app.
Can I write and run code in this Git Advanced: Monorepo, Submodules & Workflows lesson?
Yes. Every Git Advanced: Monorepo, Submodules & Workflows lesson includes a built-in code editor, so you write and run real code right in your browser and get instant AI feedback — no local setup required.
All lessons in this course
- Interactive Rebase and Amending
- Stashing and Cherry-picking Changes
- Reflog for Recovery
- Bisect: Hunting Down Bad Commits