Difference between git stash pop and git stash apply

git git-stash
Sandeep Raju Prabhakar picture Sandeep Raju Prabhakar · Mar 8, 2013 · Viewed 403.7k times · Source

I've been using git stash pop for quite some time. I recently found out about the git stash apply command. When I tried it out, it seemed to work the same as git stash pop.

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

Answer

John Zwinck picture John Zwinck · Mar 8, 2013

git stash pop throws away the (topmost, by default) stash after applying it, whereas git stash apply leaves it in the stash list for possible later reuse (or you can then git stash drop it).

This happens unless there are conflicts after git stash pop, in which case it will not remove the stash, leaving it to behave exactly like git stash apply.

Another way to look at it: git stash pop is git stash apply && git stash drop.

Related questions

Stash only one file out of multiple files that have changed with Git?

How can I stash only one of multiple changed files on my branch?

Read More
How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?

How do I ignore the following error message on Git pull? Your local changes to the following files would be overwritten by merge What if I want to overwrite them? I've tried things like git pull -f, but nothing works. …

Read More
See what's in a stash without applying it

I see here you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

Read More