----- Original Message ----- > From: "Michele Ballabio" <barra_cuda@xxxxxxxxxxxx> > To: "Stephen Bash" <bash@xxxxxxxxxxx> > Cc: "Git Mailing List" <git@xxxxxxxxxxxxxxx> > 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. > > > To complicate things a bit more, in the real world there may be > > multiple > > merges from the release branch to mainline during the life of the > > release > > branch, so any solution that also deals with that would be > > outstanding > > (probably at the cost of additional complexity?) > > Maybe something like: > > for i in $(git rev-list --merges last_interesting_tag..mainline) > do > git log $(git merge-base $i^1 $i^2)..$i^2 > done Hm... Makes sense... I'll have to play with it a little bit to get a good feel for how it fits our workflow, but it seems like a really good option. Thanks! Stephen -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html