* Showing all stashed changes in one go
@ 2012-09-27 20:00 Yann Dirson
2012-09-27 20:22 ` Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: Yann Dirson @ 2012-09-27 20:00 UTC (permalink / raw)
To: GIT list
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 ?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Showing all stashed changes in one go
2012-09-27 20:00 Showing all stashed changes in one go Yann Dirson
@ 2012-09-27 20:22 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2012-09-27 20:22 UTC (permalink / raw)
To: Yann Dirson; +Cc: GIT list
On Thu, Sep 27, 2012 at 10:00:06PM +0200, Yann Dirson wrote:
> 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 :)
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.
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-27 20:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-27 20:00 Showing all stashed changes in one go Yann Dirson
2012-09-27 20:22 ` Jeff King
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).