git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "Bertrand Jacquin" <beber.mailing@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Howto get the merge-base ?
Date: Sun, 14 May 2006 10:44:53 -0700	[thread overview]
Message-ID: <7v3bfc33hm.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <4fb292fa0605141021r20cefaa0he592b9c713ede333@mail.gmail.com> (Bertrand Jacquin's message of "Sun, 14 May 2006 19:21:01 +0200")

"Bertrand Jacquin" <beber.mailing@gmail.com> writes:

> I'm trying to know which commit it the parent of a merge.
> For exemple if I do that :
>
>   o Merge
>  / \
> /   \
> |   |
> |   o Commit D
> |   |
> |   o Commit C
> |   |
> o   | Commit B
> \  /
>  \/
>  o Commit A
>  |
>  o Init
>
> How could I know that ``Commit A'' is the merge-base of ``Merge'' ?

> I try to get this git-merge-base but result is strange and quiet
> mysterious as he return me always second args I passed to.

It is mysterious to me because you did not say what you gave as
arguments ;-).

If I am reading you correctly, you already have a "Merge"
commit, made by you or somebody else, and are trying to figure
out where the merge base was.  If that is the case:

	git-merge-base Merge^1 Merge^2

in other words

	git-merge-base CommitB CommitD        

is what you are looking for?

But what do you need that information for?  To reproduce
somebody else's merge?

  reply	other threads:[~2006-05-14 17:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-14 17:21 Howto get the merge-base ? Bertrand Jacquin
2006-05-14 17:44 ` Junio C Hamano [this message]
2006-05-14 18:04   ` Bertrand Jacquin
2006-05-14 18:12     ` Junio C Hamano
2006-05-14 18:40 ` Linus Torvalds

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=7v3bfc33hm.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=beber.mailing@gmail.com \
    --cc=git@vger.kernel.org \
    /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).