From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: how to list commits on branch since last merge Date: Tue, 8 Mar 2011 13:05:33 -0500 Message-ID: <20110308180533.GB1823@sigill.intra.peff.net> References: <4D75ED72.8030203@drmicha.warpmail.net> <4D75FB7B.70403@drmicha.warpmail.net> <20110308171251.GA1823@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Michael J Gruber , git To: Jay Soffian X-From: git-owner@vger.kernel.org Tue Mar 08 19:05:45 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Px1Hz-0007YZ-Jm for gcvg-git-2@lo.gmane.org; Tue, 08 Mar 2011 19:05:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752889Ab1CHSFh convert rfc822-to-quoted-printable (ORCPT ); Tue, 8 Mar 2011 13:05:37 -0500 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net ([99.108.226.0]:52107 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752550Ab1CHSFg (ORCPT ); Tue, 8 Mar 2011 13:05:36 -0500 Received: (qmail 1179 invoked by uid 107); 8 Mar 2011 18:06:01 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Tue, 08 Mar 2011 13:06:01 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 08 Mar 2011 13:05:33 -0500 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Mar 08, 2011 at 12:39:10PM -0500, Jay Soffian wrote: > >> Going back to my original picture, I mean commit m: > >> > >> =C2=A0 o---o---x---o---... =C2=A0 =C2=A0foo > >> =C2=A0 =C2=A0\ =C2=A0 =C2=A0 =C2=A0 \ > >> =C2=A0 =C2=A0 o---o---m---o---... =C2=A0bar > >> > >> merge-base foo bar gives me x; to get m I then need to grep the ou= tput > >> of rev-list --parents for x. > > > > Isn't the merge the first commit in bar that is not in foo? IOW: >=20 > No, because bar is never merged to foo. Let me relabel the picture: Oh, of course. Sorry for the misdirection. Too little sleep. :) > I guess this is not at all a common thing, since it seems to be > confounding the list. :-) Yeah, I think in many cases when "foo" and "bar" are merged, they both end up getting the merge commit, and "foo..bar" and "foo...bar" becomes a lot more useful. Yours is more of a long-running maintenance branch scenario. Which is not all that uncommon, of course, but I can't remember a time when I wanted to ask for what you're looking for. -Peff