From: Linus Torvalds <torvalds@linux-foundation.org>
To: Paul Mackerras <paulus@samba.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Better handling of local changes in 'gitk'?
Date: Fri, 13 Jul 2007 12:32:05 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0707131231080.20061@woody.linux-foundation.org> (raw)
In-Reply-To: <18071.20289.270560.640460@cargo.ozlabs.ibm.com>
On Fri, 13 Jul 2007, Paul Mackerras wrote:
>
> I should add that I'm sure that gitk won't yet do the right thing if
> there are files in the index at other than stage 0, or if the local
> changes are the result of an incomplete merge. (In the latter case I
> suppose one or other of the fake commits should have multiple parents,
> but I don't have the infrastructure to add fake commits with multiple
> parents yet.)
That would be beautiful to see, indeed, when you're in the middle of a
merge. "gitk --merge" already does most of it, but actually seeing the
diff of the currently merged stuff would be pretty darn cool.
Linus
next prev parent reply other threads:[~2007-07-13 19:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-12 19:20 Better handling of local changes in 'gitk'? Linus Torvalds
2007-07-12 20:43 ` 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 [this message]
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.0707131231080.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).