git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: Stephen Bash <bash@genarts.com>
Cc: Michele Ballabio <barra_cuda@katamail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: git log for a merged branch
Date: Mon, 13 Sep 2010 16:43:59 +0200	[thread overview]
Message-ID: <AANLkTikw0Cx7aymTxpjRwwxdj0s607eL0creyV5Y+KJQ@mail.gmail.com> (raw)
In-Reply-To: <15224422.248536.1284387218322.JavaMail.root@mail.hq.genarts.com>

On Mon, Sep 13, 2010 at 4:13 PM, Stephen Bash <bash@genarts.com> wrote:
> ----- Original Message -----
>> From: "Santi Béjar" <santi@agolina.net>
>> To: "Stephen Bash" <bash@genarts.com>
>> Cc: "Michele Ballabio" <barra_cuda@katamail.com>, "Git Mailing List" <git@vger.kernel.org>
>> Sent: Monday, September 13, 2010 10:00:18 AM
>> Subject: Re: git log for a merged branch
>>
>> 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^@)
>
> That's surprisingly compact...  Impressive.
>
> Slightly changing the topic, we normally tag the release branch, then merge, then delete the branch.  Is there a simple way to determine mergemt from the release tag?

So, in other words, you want the list of descendants of the given
release tag say v1.7.3-rc1, contained in a give branch, say "master":

$ git rev-list --parents v1.7.3-rc1..master | grep $(git rev-parse
v1.7.3-rc1^{})
5418d96ddca8134b5abeb99430f61c062d91f722
3b3a8ed4beadf5d9437597108355b23c7143bc81

But note that it may not be unique and may change over time. In
particular if you have more commits on top of the tag and merge again.

Santi

      reply	other threads:[~2010-09-13 14:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <22744209.230141.1283954076245.JavaMail.root@mail.hq.genarts.com>
2010-09-08 14:04 ` git log for a merged branch Stephen Bash
2010-09-08 14:23   ` Tor Arntsen
2010-09-08 15:22     ` Stephen Bash
2010-09-08 23:17   ` Michele Ballabio
2010-09-13 13:37     ` Stephen Bash
2010-09-13 14:00       ` Santi Béjar
2010-09-13 14:13         ` Stephen Bash
2010-09-13 14:43           ` Santi Béjar [this message]

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=AANLkTikw0Cx7aymTxpjRwwxdj0s607eL0creyV5Y+KJQ@mail.gmail.com \
    --to=santi@agolina.net \
    --cc=barra_cuda@katamail.com \
    --cc=bash@genarts.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).