From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 19:44:55 +0200 Message-ID: <837fygo7vs.fsf@gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> <83egsoobnr.fsf@gnu.org> <8761e0va9n.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417110309 4035 80.91.229.3 (27 Nov 2014 17:45:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:45:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:45:02 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xu37m-0006bY-G6 for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:45:02 +0100 Original-Received: from localhost ([::1]:40967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu37m-00072a-4B for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:45:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu37U-00072R-Ir for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:44:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu37P-0000YB-Gx for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:44:44 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:36827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu37P-0000Xs-8U for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:44:39 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NFP00J00KVV4U00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:44:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFP00IGNLADZFA0@a-mtaout23.012.net.il>; Thu, 27 Nov 2014 19:44:37 +0200 (IST) In-reply-to: <8761e0va9n.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178371 Archived-At: > From: Andreas Schwab > Date: Thu, 27 Nov 2014 18:11:32 +0100 > Cc: emacs-devel@gnu.org > > Eli Zaretskii writes: > > >> You do it to the two branches that were merged. So e.g. > >> > >> commit ba4502fe1465f7803beca3ae187e41f0b25bef10 > >> Merge: b121ef1 81e0cca > >> Author: Ted Zlatanov > >> Date: Wed Nov 26 21:31:11 2014 -0500 > >> > >> Merge branch 'emacs-24' > >> > >> means you do `git log b121ef1..81e0cca' > > > > AFAIU, this only shows the merge-commits, but doesn't otherwise > > identify the commits that were done on another branch. > > It shows all commits reachable by 81e0cca that are not reachable by > b121ef1, which means all commits that were merged in. Yes, it shows them. But I said "identify", i.e. I meant there's (AFAIK) no indication on each commit that "git log" shows which says if that commit was on the branch or on master. Unless you use some non-default switches to 'log'. If that's not true, how do I tell which commits in the linear list shown by "git log" were made on master, and which were committed to emacs-24 and later merged?