From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <chriscool@tuxfamily•org>
Cc: git@vger•kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Miklos Vajna <vmiklos@frugalware•org>
Subject: Re: [RFC/PATCH v2] merge-base: teach "git merge-base" to accept more than 2 arguments
Date: Sun, 27 Jul 2008 23:18:51 -0700 [thread overview]
Message-ID: <7vej5ev8dw.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200807280810.20922.chriscool@tuxfamily.org> (Christian Couder's message of "Mon, 28 Jul 2008 08:10:20 +0200")
Christian Couder <chriscool@tuxfamily•org> writes:
> Yeah, but what is quite confusing I think is that a merge base seems to be
> defined as "an as good as possible _common_ ancestor" but in this case, the
> result of "git merge-base A B C" is not an ancestor of C (even with --all
> option). So perhaps we need a better definition.
See my other message. "git merge-base A B C" is not the best common
ancestors across A B and C. It is the best common ancestors between A and
a commit that is a merge between B and C.
By defining/explaining it that way, you can avoid the "Huh, are you
talking about OR or AND" question you would inevitably get when you say
"Common ancestor of A and B or A and C". Also in "git merge-base A B C",
A is fundamentally different from any other commit; a commit being (or not
being) common between A and B (or A and C) is what we care about a lot,
but a commit being (or not being) common between B and C does not matter
in this computation.
next prev parent reply other threads:[~2008-07-28 6:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-27 3:33 [RFC/PATCH v2] merge-base: teach "git merge-base" to accept more than 2 arguments Christian Couder
2008-07-27 4:47 ` Junio C Hamano
2008-07-28 6:10 ` Christian Couder
2008-07-28 6:18 ` Junio C Hamano [this message]
2008-07-27 14:38 ` Johannes Schindelin
2008-07-27 15:28 ` Miklos Vajna
2008-07-27 18:11 ` Junio C Hamano
2008-07-27 20:44 ` Johannes Schindelin
2008-07-27 20:47 ` Re* " Junio C Hamano
2008-07-28 5:49 ` Christian Couder
2008-07-27 15:02 ` Jakub Narebski
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=7vej5ev8dw.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=vmiklos@frugalware$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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