From: Linus Torvalds Date: Thu, 09 Feb 2006 16:42:39 GMT Subject: Re: gitweb using "--cc"? Message-ID: In-Reply-To: On Thu, 9 Feb 2006, Linus Torvalds wrote: > > This is a first try at it. Btw, if it wasn't clear, this patch _does_ fix the fact that "git-whatchanged" didn't show merges even if they have conflicts. Of course, since the raw format is equivalent to "-c" and only bases its "should I show" logic on whether the file has changed at all, it very fundamentally will never be able to tell the difference between a real content conflict and something that just had file-level automatic merging. So "git-whatchanged" will now show a lot of merges that didn't really change anything, but that just merged on a file level (ie the whole merge just goes away when you specify "--cc"). Still, that's actually interesting information too, so you can consider this a feature. Linus