Re: git log for a merged branch
- From
- Santi Béjar <santi@agolina.net>
- Date
- Sep 13, 2010, 14:43 UTC
- Message-ID
- <AANLkTikw0Cx7aymTxpjRwwxdj0s607eL0creyV5Y+KJQ@mail.gmail.com>
- 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:
Show 18 quoted lines
> ----- 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