From: Junio C Hamano <junkio@cox.net>
Date: Thu, 09 Feb 2006 03:14:18 GMT
Subject: Re: gitweb using "--cc"?
Message-ID: <7vu0b9jkad.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0602081817040.2458@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

> Now, arguably, the raw format should default to the same kind of "were 
> there data conflicts" that "-c" does for merges, but it doesn't, so it's 
> silent ;(

True.  There was a discussion to come up with a sensible
semantics for -c without -p (currently --cc and -c implies -p),
but I haven't got around to it, since --cc was more useful in
general.

Volunteers?