Skip to contentSkip to conversation

Showing all stashed changes in one go

DISCUSSION Yann Dirson 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

When I have a couple of stashed changes, it gets annoying to repeatedly call "git stash show -p stash@{N}" until finding the correct one.

Since "git reflog show stash" already does part of the job, I thought that adding "-p" there to see the patch would help (at least it would show the not-yet-staged parts, which would already be a good start).

But the output is then really strange: does it really print the delta between every two reflog entries ? I can't think of a situation where it would be was we want - but then, my imagination is known to be deficient when I hit a situation that does not do what I was expecting at first :)

Is there another way I missed to get all those stash contents listed, besides scriptically iterating ?

#1 lore raw
Quoted 8 lines · Yann Dirson

When I have a couple of stashed changes, it gets annoying to repeatedly call "git stash show -p stash@{N}" until finding the correct one.

Since "git reflog show stash" already does part of the job, I thought that adding "-p" there to see the patch would help (at least it would show the not-yet-staged parts, which would already be a good start).

Quoted 5 lines

But the output is then really strange: does it really print the delta between every two reflog entries ? I can't think of a situation where it would be was we want - but then, my imagination is known to be deficient when I hit a situation that does not do what I was expecting at first :)

This is a known issue. The reflog walker rewrites the parents of each commit to make them look like a chain, but it means that your diffs are between reflog entries, not to the true parents.

Quoted 2 lines

Is there another way I missed to get all those stash contents listed, besides scriptically iterating ?

You can do:

  git rev-list -g <ref> | git log --stdin --no-walk <other options>

to show the individual commits with their true parents. But note that stash commits are a little confusing (they are merges representing the index and working tree state).

-Peff