From: Linus Torvalds <torvalds@linux-foundation.org>
To: Paul Mackerras <paulus@samba.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Better handling of local changes in 'gitk'?
Date: Thu, 12 Jul 2007 12:20:05 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0707121214420.20061@woody.linux-foundation.org> (raw)
I like how gitk shows the local changes as an unnamed commit at the top,
but what I *don't* like is how it just ignored the difference between
stuff that has been added to the index, and stuff that hasn't..
It would be very nice to have *two* such commits (either or both of which
just disappear), where the top-most is the diff to the index, and the
second is the diff from the index to HEAD.
That would not only be useful in general, it would be a wonderful way to
visually introduce people to the notion of what the staging area is all
about.
I think "gitk" was a great way early in git history to show how the git
commit history works and that it made a lot of people understand a lot
more how everything tied together (in a way that would have been much
nastier to visualize with just the SHA1's in "git log"), and I think it
could do the same thing for the staging area, which still seems to
occasionally come up as an issue that confuses some people.
But my inability with tcl/tk precludes me from actually changing the logic
that does
git diff-index HEAD
into two different things that do the two operations
git diff-index --cached HEAD
git diff-files
respectively and ties them together as the two fake commits...
Paul?
Linus
next reply other threads:[~2007-07-12 19:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-12 19:20 Linus Torvalds [this message]
2007-07-12 20:43 ` Better handling of local changes in 'gitk'? Junio C Hamano
2007-07-12 20:48 ` Junio C Hamano
2007-07-12 21:01 ` Linus Torvalds
2007-07-13 9:55 ` Paul Mackerras
2007-07-13 10:09 ` Paul Mackerras
2007-07-13 19:32 ` Linus Torvalds
2007-07-13 10:33 ` Johannes Sixt
2007-07-13 17:36 ` Linus Torvalds
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=alpine.LFD.0.999.0707121214420.20061@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
/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).