Re: The merge from hell...

From: Linus Torvalds <torvalds@osdl.org>
Date: Feb 2, 2006, 08:02 UTC
Message-ID: <Pine.LNX.4.64.0602012356131.21884@g5.osdl.org>
In-Reply-To: <e5bfff550602012325s7d0a799ct5bfabbce2c579449@mail.gmail.com>

On Thu, 2 Feb 2006, Marco Costalba wrote:

Show 5 quoted lines

> 
> Currently the public git repo version of qgit uses "git-diff-tree -c"
> for merges, It's not a problem to change qgit to use --cc option
> instead. But I would like to use just one kind of option to filter
> merges files.

I think using "-c" rather than "--cc" is fine, and if it makes parsing easier..

The "--cc" option should show less "noise", an dI'm actually arguing that it should show even less than it does now (for when the branches agreed with each other, and there was no actual conflict, which is what I think is more useful), but I don't think "-c" is _wrong_ either.

Using "-c" is a strange kind of "show all differences in a file that had file-level merges" while at least to me "--cc" is meant to be more of a "show all actual file-level CONFLICTS where the merge actually did something different"

		Linus