Do stashes survive a restart?

Yes! Stashes are stored in the Git repository (.git/refs/stash). They persist until you explicitly remove them (pop or drop) or the repository is deleted.

What is the difference between stash pop and stash apply?

pop restores changes AND removes the stash from the stack. apply restores changes but keeps the stash. Use apply if you want to apply the same stash to multiple branches.

How do I stash specific files?

Use git stash push -m "message" -- file1 file2. Only the specified files will be stashed; the others will remain in the working directory.

Can I stash untracked files?

Not by default. Use the -u flag (or --include-untracked) to include untracked files: git stash push -u -m "with untracked files". Use -a to also include ignored files.

How do I view the contents of a stash?

Type git stash show for a summary of the latest stash. Add -p for the full diff: git stash show -p stash@{0}. You can also specify a particular stash using its index.

Git stash: set aside your changes

Need to switch branches but haven't finished your work? git stash temporarily saves your changes so you can come back to them later.

Practice git stash Git Glossary

gitquest — enquête

When to use git stash?

Switching branches

You're working on a feature but are asked to fix an urgent bug on main. Stash your changes, switch branches, fix the bug, then come back.

Before a pull

You have local changes and git pull refuses to merge. Stash, pull, then pop to get your changes back on the updated version.

Testing something

You want to quickly test a clean state of the code without losing your work in progress. Stash, test, then pop.

Git stash in practice

Set aside and retrieve your changes.

Stashing changes

gitquest — stash

# You're working on a file but need to switch branches

$git status

modified: index.html

# Set aside the changes

$git stash push -m "WIP: header redesign"

Saved working directory and index state: WIP: header redesign

$git status

nothing to commit, working tree clean

# You can now switch branches safely

Retrieve and manage

gitquest — stash pop

# View the stash list

$git stash list

stash@{0}: WIP: header redesign

stash@{1}: WIP: form debugging

# Retrieve the latest stash (and remove it from the stack)

$git stash pop

Changes restored! stash@{0} dropped.

# Or apply without removing (keep in reserve)

$git stash apply stash@{0}

Changes restored. Stash preserved.

Essential stash commands

git stash

Stash changes (shortcut for push)

git stash push -m "msg"

Stash with a descriptive message

git stash list

List all saved stashes

git stash pop

Restore and remove the latest stash

git stash apply

Restore without removing the stash

git stash drop stash@{n}

Remove a specific stash

Part of the Undo Changes in Git guide

Related commands

git status

Check state before stashing

git branch

Switch branches after stash

git clean

Remove untracked files

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about git stash

Practice stash in GitQuest

GitQuest investigations put you in situations where you need to juggle between branches and changes.

Start practicing now