From: Jeff King <peff@peff.net>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Visualising stashed commits in gitk/qgit/giggle
Date: Thu, 30 Aug 2007 04:29:12 -0400 [thread overview]
Message-ID: <20070830082912.GB6097@coredump.intra.peff.net> (raw)
In-Reply-To: <46a038f90708291738h6a399d7bs4dd6778c8815390a@mail.gmail.com>
On Thu, Aug 30, 2007 at 12:38:35PM +1200, Martin Langhoff wrote:
> Now that we have had git stash in master for a while, I've gotten
> completely addicted to it. :-) Before I used to create mini branches
> all the time, and my working repos were littered with 'WIP-nn'
> branches everywhere.
>
> Which was mucky... but appeared in gitk/qgit transparently.
>
> Is there any way to get them to appear in gitk or any other gui
> history browser?
The stash list is stored as a reflog, so any browser that understands
reflogs will visualize them fine. gitk's visualization of reflogs (gitk
-g) tends to be a bit cluttered, because it finds and displays the real
parents, which doesn't quite mesh with the reflog-ordered view of
history. You can try "gitk stash" to see the structure of the latest
stash, and you can try "gitk -g stash", but it's pretty unreadable.
You really need another way to get the refs into gitk's view without
using '-g'. You can do this: "gitk stash@{0} stash@{1} stash@{2}" which
looks OK, but doesn't scale for obvious reasons.
Tig actually displays reflogs nicely, because it has a much simpler
concept of viewing history. 'tig -g stash' will give you the stashes, in
order, for inspection.
Perhaps not the answer you were looking for, but it might give you a
start on implementing something. What kind of display were you looking
for? A view of the stashes as if they were a chain of commits (like tig
gives), or the stashes inserted into the full history graph (like gitk
stash@{0} stash@{1})?
-Peff
prev parent reply other threads:[~2007-08-30 8:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 0:38 Visualising stashed commits in gitk/qgit/giggle Martin Langhoff
2007-08-30 8:29 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070830082912.GB6097@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).