From: Andreas Schwab <schwab@linux-m68k.org>
To: Jeff King <peff@peff.net>
Cc: Jay Soffian <jaysoffian@gmail.com>,
Michael J Gruber <git@drmicha.warpmail.net>,
git <git@vger.kernel.org>
Subject: Re: how to list commits on branch since last merge
Date: Tue, 08 Mar 2011 20:08:55 +0100 [thread overview]
Message-ID: <m2r5ahqvjs.fsf@igel.home> (raw)
In-Reply-To: <20110308171251.GA1823@sigill.intra.peff.net> (Jeff King's message of "Tue, 8 Mar 2011 12:12:51 -0500")
Jeff King <peff@peff.net> writes:
> On Tue, Mar 08, 2011 at 05:11:16AM -0500, Jay Soffian wrote:
>
>> Going back to my original picture, I mean commit m:
>>
>> o---o---x---o---... foo
>> \ \
>> o---o---m---o---... bar
b1
>>
>> merge-base foo bar gives me x; to get m I then need to grep the output
>> of rev-list --parents for x.
>
> Isn't the merge the first commit in bar that is not in foo? IOW:
>
> git rev-list foo..bar | tail -n 1
That would show the commit marked b1 above, wouldn't it? ^foo cuts only
x and its parents, but not the other parent of m.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-03-08 19:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-08 7:24 how to list commits on branch since last merge Jay Soffian
2011-03-08 8:48 ` Michael J Gruber
2011-03-08 9:35 ` Jay Soffian
2011-03-08 9:39 ` Michael J Gruber
2011-03-08 9:43 ` Jay Soffian
2011-03-08 9:48 ` Michael J Gruber
2011-03-08 10:11 ` Jay Soffian
2011-03-08 10:25 ` Michael J Gruber
2011-03-08 17:12 ` Jeff King
2011-03-08 17:39 ` Jay Soffian
2011-03-08 18:05 ` Jeff King
2011-03-08 19:08 ` Andreas Schwab [this message]
2011-03-08 21:03 ` Jeff King
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=m2r5ahqvjs.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.