From: Santi Béjar <santi@agolina.net>
Date: Mon, 13 Sep 2010 14:00:18 GMT
Subject: Re: git log for a merged branch
Message-ID: <AANLkTikbnoR_=x1_Aq4jh1BuMarEMxXkY=iX0iOjdgyt@mail.gmail.com>
In-Reply-To: <30770696.248360.1284385078695.JavaMail.root@mail.hq.genarts.com>

On Mon, Sep 13, 2010 at 3:37 PM, Stephen Bash <bash@genarts.com> wrote:
>
>
> ----- Original Message -----
>> From: "Michele Ballabio" <barra_cuda@katamail.com>
>> To: "Stephen Bash" <bash@genarts.com>
>> Cc: "Git Mailing List" <git@vger.kernel.org>
>> Sent: Wednesday, September 8, 2010 7:17:05 PM
>> Subject: Re: git log for a merged branch
>> On Wednesday 08 September 2010, Stephen Bash wrote:
>>
>> Let's call the merge commit "mergecmt". The commit where the "release"
>> branch
>> branched off is
>>
>> git merge-base mergecmt^1 mergecmt^2
>>
>> ... where mergecmt^1 is the first parent of the merge (usually on the
>> "mainline" branch) and mergecmt^2 is the second parent, which
>> usually(*)
>> refers to the "release" branch (in this case, tagFoo).
>>
>> So
>>
>> git log $(git merge-base mergecmt^1 mergecmt^2)..mergecmt^2
>>
>> is what you want.

If there is more than one merge-base you´ll have to use:

git log mergecmt^2 --not $(git merge-base mergecmt^1 mergecmt^2)

and you may use this shorter form:

git log mergecmt^2 --not $(git merge-base mergecmt^@)

HTH,
Santi