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 16:03:12 -0500 Message-ID: <20110308210312.GA4594@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 Cc: git To: Andreas Schwab X-From: git-owner@vger.kernel.org Tue Mar 08 22:03:26 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 1Px43v-0006OO-LA for gcvg-git-2@lo.gmane.org; Tue, 08 Mar 2011 22:03:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756607Ab1CHVDR (ORCPT ); Tue, 8 Mar 2011 16:03:17 -0500 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net ([99.108.226.0]:52419 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756532Ab1CHVDO (ORCPT ); Tue, 8 Mar 2011 16:03:14 -0500 Received: (qmail 4212 invoked by uid 107); 8 Mar 2011 21:03:39 -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 16:03:39 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 08 Mar 2011 16:03:12 -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 08:08:55PM +0100, Andreas Schwab wrote: > > 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. Yes, just me being dumb. See the other subthread. -Peff