From: Stephen Bash <bash@genarts.com>
To: Tor Arntsen <tor@spacetec.no>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git log for a merged branch
Date: Wed, 8 Sep 2010 11:22:22 -0400 (EDT) [thread overview]
Message-ID: <7551190.230240.1283959342943.JavaMail.root@mail.hq.genarts.com> (raw)
In-Reply-To: <AANLkTimSHrmQgcrx-CqMgvkcBdgBG9icqw934+7qP7kg@mail.gmail.com>
----- Original Message -----
> From: "Tor Arntsen" <tor@spacetec.no>
> To: "Stephen Bash" <bash@genarts.com>
> Cc: "Git Mailing List" <git@vger.kernel.org>
> Sent: Wednesday, September 8, 2010 10:23:47 AM
> Subject: Re: git log for a merged branch
> On Wed, Sep 8, 2010 at 16:04, Stephen Bash <bash@genarts.com> wrote:
>
> > 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.
That's actually a pretty cool trick. I will file that one for adoption as we move to a git-centric workflow.
I'm still curious if there's an "easy" way to extract the segment of history that was the release branch because I feel like there may be other uses than just git log... (not that I've nailed them down yet)
Thanks!
Stephen
next prev parent reply other threads:[~2010-09-08 15:22 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 [this message]
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
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=7551190.230240.1283959342943.JavaMail.root@mail.hq.genarts.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=tor@spacetec.no \
/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).