git stash apply version

Question

I have 2 branches: master | design

Working in design I did a stash and switched to master, made some adjustments. Switched back to design and did a stash apply only to lose all my changes in the design branch.

I am hoping all my work is within a stash as I have not cleared or removed these.

If I do a stash list I get 4 results:

stash@{0}: WIP on design: f2c0c72... Adjust Password Recover Email

stash@{1}: WIP on design: f2c0c72... Adjust Password Recover Email

stash@{2}: WIP on design: eb65635... Email Adjust

stash@{3}: WIP on design: eb65635... Email Adjust

If I try git stash apply f2c0c72 I am getting an error:

fatal: Needed a single revision

f2c0c72: no valid stashed state found

How can I apply a specific stash?

Answer 1

For this question try:

git stash apply stash@{0}

In some shells like zsh,powershell there you need to quote “stash@{0}”

Since version 2.11 this became pretty easier  you can use ‘N’ stack instead of ‘stash@{n}’

The command for this is:

git stash apply n

This is how you can stash apply in git versions.

To get the list of stashes you could use:

git stash list

Answer 2

To apply a stash and remove it from the stash list, run:

git stash pop stash@

To apply a stash and keep it within the stash cache, run:

git stash apply stash@