From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Fri, 28 Nov 2014 09:33:47 +0100 Message-ID: <87ppc7g1w4.fsf@igel.home> 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> <837fygo7vs.fsf@gnu.org> <87wq6gttmo.fsf@igel.home> <833894o6zk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417163667 10214 80.91.229.3 (28 Nov 2014 08:34:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 08:34:27 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 09:34:19 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 1XuH0N-0000BM-5E for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 09:34:19 +0100 Original-Received: from localhost ([::1]:43014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuH0M-0000yQ-Lo for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 03:34:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuH05-0000Wh-ML for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:34:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuH00-00051K-As for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:34:01 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:41647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGzu-00050I-AM; Fri, 28 Nov 2014 03:33:50 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jppyj1KJXz3hjQR; Fri, 28 Nov 2014 09:33:48 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jppyh6S5BzvkHt; Fri, 28 Nov 2014 09:33:48 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id NaCzTYzcWrqy; Fri, 28 Nov 2014 09:33:48 +0100 (CET) X-Auth-Info: 54vB/T4Z1UsY5XwrcfOFsha0ji9MCG2/NwNraybiVOOEH2n78bzYM+QvVI8LwJWX Original-Received: from igel.home (host-188-174-213-205.customer.m-online.net [188.174.213.205]) by mail.mnet-online.de (Postfix) with ESMTPA; Fri, 28 Nov 2014 09:33:48 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id EEA1A2C1C68; Fri, 28 Nov 2014 09:33:47 +0100 (CET) X-Yow: Why was I BORN? In-Reply-To: <833894o6zk.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 27 Nov 2014 20:04:15 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:178403 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: emacs-devel@gnu.org >> Date: Thu, 27 Nov 2014 18:56:15 +0100 >> >> Eli Zaretskii writes: >> >> > 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? >> >> By looking from which branch they are reachable. > > How do I do that? If "git merge-base A B" outputs (the SHA1 of) B then you know that B is reachable by A. Another way to visualize this is to use "git show-branch A B". 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."