From: Linus Torvalds Date: Thu, 02 Feb 2006 23:03:02 GMT Subject: Re: [PATCH] combine-diff: add safety check to --cc. Message-ID: In-Reply-To: <7vvevyrtn9.fsf_-_@assigned-by-dhcp.cox.net> On Thu, 2 Feb 2006, Junio C Hamano wrote: > > The earlier change implemented "only two version" check but > without checking if the change rewrites from all the parents. > This implements a check to make sure that a change introduced > by the merge from all the parents is caught to be interesting. Ok, my testing shows that this is all wonderful. In fact, git-diff-tree now gets the subtle cases right for things that "gitk" for some reason gets wrong. I haven't figured out what's wrong with gitk, but I don't think it's even worth it: it would be better to just teach gitk to use git-diff-tree --cc. And now when I look at Len's "Merge from hell", not only does it take less than 2 seconds for git-diff-tree to calculate, it looks correct too. At least I don't see anything that I consider extraneous, although it might, of course, have removed too much, and I'd not notice. But it looks great (well, as great as it can look without colorization and/or years of experience with it - multi-way diffs really aren't very readable ;) Paul, I'm not able to do something like this in tcl/tk, but could you look at trying to make gitk use "git-rev-list --cc" for the colorization? Linus