git stash apply version

user_99877 0
Viewed 630335

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?

git-stash git
8 Answers

The keys into the stash are actually the stash@{n} items on the left. So try: 

git stash apply stash@{0}

(note that in some shells you need to quote "stash@{0}", like zsh, fish and powershell).

Since version 2.11, it's pretty easy, you can use the N stack number instead of using stash@{n}. So now instead of using:

git stash apply "stash@{n}"

You can type:

git stash apply n

To get list of stashes:

git stash list

In fact stash@{0} is a revision in git that you can switch to... but git stash apply ... should figure out how to DTRT to apply it to your current location.

user_851340

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

git stash pop stash@{n}

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

git stash apply stash@{n}
user_391550 
git stash list

List will show all stashed items eg:stash@{0}:,stash@{1}:,..,stash@{n}:

Then select the number n which denotes stash@{n}:

git stash apply n

for example:

git stash apply 1

will apply that particular stashed changes to the current branch

user_74337770

To view your recent work and what branch it happened on run

git stash list

then select the stash to apply and use only number:

git stash apply n

Where n (in the above sample) is that number corresponding to the Work In Progress.

user_81998790

If you have more stashes I recommend you to check before you will apply them. Use:

git stash show -p

to see the last stash in detail. If you have more stashes and you want a specific one then add a number of stash at the end:

git stash show 1

Then when you find the right stash apply it by typing:

git stash apply 1

Again the number is an example without number you will apply the last one.

user_177038630

You need to quote the string, because your shell is eating the content of the {} as an expansion. So use git stash apply 'stash@{index}'. Alternatively you can use the SHA of the stash, or next time when you apply it, you can name the stash yourself.

user_59066240
Related