Re: git log for a merged branch

From: Tor Arntsen <tor@spacetec.no>
Date: Sep 8, 2010, 14:23 UTC
Message-ID: <AANLkTimSHrmQgcrx-CqMgvkcBdgBG9icqw934+7qP7kg@mail.gmail.com>
In-Reply-To: <14267801.230161.1283954674012.JavaMail.root@mail.hq.genarts.com>

On Wed, Sep 8, 2010 at 16:04, Stephen Bash <bash@genarts.com> wrote:

Show 5 quoted lines

> Hi everyone-
>
> A coworker asked me a Git question yesterday that I can't answer, so I thought I'd pass it along:
>
> Assume I have a release branch with bug fixes that is tagged at the end of the release cycle (let's call the tag tagFoo).  The release branch then gets merged back into mainline development (call the branch mainline), and the release branch is deleted.  If I want to see the commits (bug fixes) performed on the release branch, how do I do it?

[..]

Maybe not exactly what you ask for, but the way I do it is simply to use a non-ff merge with additional logging, i.e. git merge --no-ff --log <branchname-with-fixes> which will give me a merge commit which includes one-liners for each of those commits merged into mainline. And I include problem report ID's in the first line of my commits I get a nice list of fixes, in a commit looking something like this:

commit <sha1>
Author:
Date:
   Merge branch 'fixes'
  * fixes:
     Fix for PR#23
     Fix for PR#1
     Fix for PR#288
..
and so on. Those 'Fix for' are just the git log --oneline of what got merged.
(Obviously what you don't see in the above is the actual sha1 of each
of those commits that got merged, but at least it's easy enough to
figure out what to put in the release notes :-)