From: Aneesh Kumar Date: Thu, 02 Feb 2006 08:07:41 GMT Subject: Re: The merge from hell... Message-ID: In-Reply-To: On 2/2/06, Linus Torvalds wrote: > > > On Thu, 2 Feb 2006, Marco Costalba wrote: > > > > 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" Ok i tried using --cc. But then as per the man page if the optimization makes the all the hunks disapper then commit log is not show unless -m is used. Is there a way to get the commit log printed. BTW using -m didn't show any difference even though man page said about some difference -aneesh