From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@uchicago.edu>
Cc: git@vger.kernel.org, David Greaves <david@dgreaves.com>
Subject: Re: [PATCH] bring description of git diff --cc up to date
Date: Tue, 22 Jul 2008 10:09:17 -0700 [thread overview]
Message-ID: <7v63qxn8w2.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080722111947.BIW29914@m4500-01.uchicago.edu> (Jonathan Nieder's message of "Tue, 22 Jul 2008 11:19:47 -0500 (CDT)")
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?
next prev parent reply other threads:[~2008-07-22 17:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 16:19 [PATCH] bring description of git diff --cc up to date Jonathan Nieder
2008-07-22 17:09 ` Junio C Hamano [this message]
2008-07-22 21:21 ` Junio C Hamano
2008-07-22 23:27 ` Jonathan Nieder
2008-07-23 0:36 ` Junio C Hamano
2008-07-23 3:55 ` Jonathan Nieder
2008-07-23 23:15 ` Junio C Hamano
2008-07-24 0:35 ` Jonathan Nieder
-- strict thread matches above, loose matches on Subject: below --
2008-07-21 18:27 Jonathan Nieder
2008-07-22 6:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v63qxn8w2.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=david@dgreaves.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@uchicago.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).