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: Thu, 27 Nov 2014 18:11:32 +0100 Message-ID: <8761e0va9n.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417108331 3364 80.91.229.3 (27 Nov 2014 17:12:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:12:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:12:04 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 1Xu2br-0001Rw-4V for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:12:03 +0100 Original-Received: from localhost ([::1]:40842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2bq-0001lI-L3 for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:12:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2bX-0001kz-T1 for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:11:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu2bT-0005EZ-22 for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:11:43 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:47711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2bN-0005Dx-V1; Thu, 27 Nov 2014 12:11:34 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jpQVY43SNz3hjRD; Thu, 27 Nov 2014 18:11:33 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jpQVY2rb4zvkFp; Thu, 27 Nov 2014 18:11:33 +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 6ZH6_ouvofPY; Thu, 27 Nov 2014 18:11:32 +0100 (CET) X-Auth-Info: q3pbOsbjDBoT898CfLwCtXL4qlCwSmkGPNQtRBsqrtKvxojSfai5ra+Hq12SsDnx Original-Received: from igel.home (ppp-188-174-148-81.dynamic.mnet-online.de [188.174.148.81]) by mail.mnet-online.de (Postfix) with ESMTPA; Thu, 27 Nov 2014 18:11:32 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 63BB12C44C7; Thu, 27 Nov 2014 18:11:32 +0100 (CET) X-Yow: Here I am in the POSTERIOR OLFACTORY LOBULE but I don't see CARL SAGAN anywhere!! In-Reply-To: <83egsoobnr.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 27 Nov 2014 18:23:20 +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:178366 Archived-At: 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. 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."