What is the difference between git stash pop and git stash apply?

git stash pop applies the most recent stash and removes it from the stash list. git stash apply applies the same changes but keeps the stash entry, which is useful if you need to apply it to more than one branch.

Does git stash save untracked or new files?

No, by default git stash only saves tracked files. Use git stash -u to also stash untracked (new) files.

How do I apply a specific stash instead of the most recent one?

Run git stash list to see indexed entries, then reference one directly, for example git stash pop stash@{1} .

How do I delete a stash I no longer need?

Run git stash drop stash@{0} to delete a specific entry, or git stash clear to delete all stashed entries permanently.

Can git stash pop cause merge conflicts?

Yes. If the stashed file has since been modified on the branch you’re restoring to, git stash pop can produce a merge conflict. Git leaves the stash entry in place until you resolve the conflict and run git stash drop manually.

Have you ever been in the middle of a complex feature, writing messy code, when suddenly a colleague asks you to fix a critical bug on production?

You can’t commit your broken code. You can’t lose your work. So, what do you do?

You stash it.

Git Stash: Temporarily Saving Uncommitted Changes

git stash is a Git command that temporarily saves uncommitted changes — both staged and unstaged — outside your commit history and reverts your working directory to the last clean commit. It’s one of those commands that feels like magic once you start using it.

Think of git stash as a “Cut and Paste” for your entire project. You cut your current work, go do something else, and paste it back when you’re ready. git stash is a working-directory tool that separates context-switching from commit history, letting you pause and resume work without creating throwaway commits.

Git Stash Command Reference

Command	What It Does
`git stash`	Stash all tracked changes (staged + unstaged).
`git stash -u`	Stash tracked and untracked (new) files.
`git stash pop`	Apply latest stash and remove it from the list.
`git stash apply`	Apply latest stash but keep it in the list.
`git stash list`	View all stashed entries with timestamps.
`git stash pop stash@{1}`	Apply a specific entry by index.
`git stash drop stash@{0}`	Delete a specific stash entry.
`git stash clear`	Delete all stash entries permanently.

How to Stash Uncommitted Changes with git stash

🔒 Subscribe to keep reading.

Managing Multiple Git Stash Entries with git stash list

🔒 Subscribe to keep reading.

Including Untracked Files with git stash -u

🔒 Subscribe to keep reading.

Git Stash: Key Takeaways for Daily Git Workflow

🔒 Subscribe to keep reading.

Subscribe to unlock the full article ❤️

I keep most of the site completely open. A few unusually detailed tutorials need a free subscriber login so I can keep publishing this kind of work.

The form below signs you up for the newsletter. It does not log you into the app — log in afterwards (same email) to unlock this article and download your subscriber gifts. New subscribers get an inbox mail: Set a password to unlock articles.

Not sure yet? Browse past issues →

Git Stash: The CTRL-Z for Your Working Directory

📚 This post is part of the "Git Survival Guide" series

Git Stash: Temporarily Saving Uncommitted Changes

Git Stash Command Reference

How to Stash Uncommitted Changes with git stash

Managing Multiple Git Stash Entries with git stash list

Including Untracked Files with git stash -u

Git Stash: Key Takeaways for Daily Git Workflow

References

Citation

Git Stash: The CTRL-Z for Your Working Directory

📚 This post is part of the "Git Survival Guide" series

Git Stash: Temporarily Saving Uncommitted Changes

Git Stash Command Reference

How to Stash Uncommitted Changes with git stash

Managing Multiple Git Stash Entries with git stash list

Including Untracked Files with git stash -u

Git Stash: Key Takeaways for Daily Git Workflow

Learn AI and Python without the hype

References

Citation

Learn AI and Python without the hype