Re: What's new in git.git

From: Linus Torvalds <torvalds@osdl.org>
Date: Feb 6, 2006, 16:03 UTC
Message-ID: <Pine.LNX.4.64.0602060754470.3854@g5.osdl.org>
In-Reply-To: <7vbqxkapr2.fsf@assigned-by-dhcp.cox.net>

On Sun, 5 Feb 2006, Junio C Hamano wrote:

> 
>  * Add -c and --cc to diff-tree and diff-files.  They give the
>    "combined diff" output that shows merges more human readably.

Btw, the only concern I have left about "-c" and "--cc" is that I don't think the old merge-diff behaviour makes any sense at all, and that we should drop it entirely in favour of "-c" and "--cc".

The old merge-diff code was so useless that nobody ever used it. It was disabled by default (you had to enable it specially with the "-m" flag), and I don't think anybody really ever did. The output was just not usable.

The only reason it existed at all was really because I _didn't_ do it right, and I wanted some output.

So I would actually much prefer that "-c" would be the default, and that "-p" would imply "--cc". With some other option to have the "long format" diff.

Has anybody on the git list ever used "-m" with git-diff-tree? Speak up..

		Linus