From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2008 17:09:17 GMT
Subject: Re: [PATCH] bring description of git diff --cc up to date
Message-ID: <7v63qxn8w2.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080722111947.BIW29914@m4500-01.uchicago.edu>

Jonathan Nieder <jrnieder@uchicago.edu> writes:

> Just to make sure I understand, here is what I think --cc does:
>
>   - In a two-parent merge, it is exactly as Linus has been
>     ...
>   - In a many-parent merge, the criterion is more stringent.
>     ...
>
> Is that correct?

The logic in the code does not have separate criteria for two-parent and
Octopus cases.  Actually Linus talks about "when you have two versions to
choose from, and if the result matches one of them, then it is not
interesting".  In a two-parent merge, you cannot have three or more
possible versions to choose from by definition, can you?