Re: Better handling of local changes in 'gitk'?

[Linus Torvalds <torvalds@linux-foundation.org>]

On Thu, 12 Jul 2007, Junio C Hamano wrote:
>
> I just meant that I agree with you that --cc between HEAD, index and the 
> working tree is a wonderful way to view the current state.

Heh. I wasn't thinking of --cc, and if seen as a combination diff, I think 
--combined would be better (we very much want to see *all* changes, not 
just the conflicting ones, no?).

I was literally meaning two separate diffs, as two separate commits. But 
yes, I do agree that it might be very interesting to make "git diff-index" 
know about --combined/--cc in addition to --cached.

> It might make sense to teach "git diff" itself to show this
> 3-way diff with a new option ("git diff --h-i-w").  The
> necessary machinery is already there to handle "git diff maint
> master next pu" (four trees!), and "git diff maint:Makefile
> master:Makefile next:Makefile" (three blobs).

Actually, I think that if you teach "git diff-index" about --combined and 
--cc, then you'll automatically get it when you just do "git diff HEAD". 
No?

		Linus