On 5/14/06, Junio C Hamano <junkio@xxxxxxx> wrote:
"Bertrand Jacquin" <beber.mailing@xxxxxxxxx> 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 ;-).
I was using git-merge-base ``merge-ish'' ``comit-ish''. Docs about it
is atrocious so was trying many but not the one good. Blam me.
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
That's ok :)
is what you are looking for?
Yes ! Thanks :)
But what do you need that information for? To reproduce
somebody else's merge?
No, that's just on the following of git-send-mail-commit.sh thread (or
something near). To make a readable merge mail with diffstat and
summury.
--
Beber
#e.fr@freenode
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html