git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Bash <bash@genarts.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: git log for a merged branch
Date: Wed, 8 Sep 2010 10:04:34 -0400 (EDT)	[thread overview]
Message-ID: <14267801.230161.1283954674012.JavaMail.root@mail.hq.genarts.com> (raw)
In-Reply-To: <22744209.230141.1283954076245.JavaMail.root@mail.hq.genarts.com>

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?

I don't think
   git log mainline..tagFoo
works because all the commits of tagFoo are now reachable by mainline thanks to the merge.  Is there a simple way to express this concept?

Obviously in a pinch a simple
   git log tagFoo
will give you everything back to the beginning of time, but I think that's suboptimal...

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?)

Thanks,
Stephen

       reply	other threads:[~2010-09-08 14:04 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 ` Stephen Bash [this message]
2010-09-08 14:23   ` git log for a merged branch 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

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=14267801.230161.1283954674012.JavaMail.root@mail.hq.genarts.com \
    --to=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).