From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 23:32:52 GMT
Subject: Re: How does git follow branch history across a merge commit?
Message-ID: <7vmy5jbjkr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vskfbcy9n.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> "Steven E. Harris" <seh@panix.com> writes:
>
>> Was it just luck that "HEAD^" referred to the predecessor that came from
>> branch "master" rather than branch "competition"?
>
> Yes, if you want the second parent you would say HEAD^2.

Ahh, I misread your question.  No, it is not luck.  If you merge
competition into your master, the resulting commit will have your master
as its first parent.  If check out competition and merge master in your
example, the resulting merge will have compatition as the first parent.