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

"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.