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: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 19:35:24 +0200 Message-ID: <871t6mzjc3.fsf@linux-m68k.org> References: <20160403111708.GA3537@acm.fritz.box> <87lh4uex9h.fsf@acer.localhost.com> <20160403121458.GC3537@acm.fritz.box> <87bn5qeuxo.fsf@acer.localhost.com> <838u0urb1w.fsf@gnu.org> <8760vyemy0.fsf@acer.localhost.com> <8337r2r996.fsf@gnu.org> <8737r2el7d.fsf@acer.localhost.com> <83zitapsvl.fsf@gnu.org> <8760vyzmm6.fsf@linux-m68k.org> <83wpoepqjf.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459704950 17657 80.91.229.3 (3 Apr 2016 17:35:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 17:35:50 +0000 (UTC) Cc: acm@muc.de, i.lohmar@gmail.com, emacs-devel@gnu.org, kaushal.modi@gmail.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 19:35:41 2016 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 1amlw3-0003H6-V0 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 19:35:40 +0200 Original-Received: from localhost ([::1]:54557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlw3-0007KL-6j for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 13:35:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlvx-0007JQ-8W for emacs-devel@gnu.org; Sun, 03 Apr 2016 13:35:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amlvw-0008Ke-Co for emacs-devel@gnu.org; Sun, 03 Apr 2016 13:35:33 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:45150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlvr-0008JR-DF; Sun, 03 Apr 2016 13:35:27 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qdMhY6f9Nz3hjR1; Sun, 3 Apr 2016 19:35:25 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qdMhY5zbwzvh21; Sun, 3 Apr 2016 19:35:25 +0200 (CEST) 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 5k6aZZ9o-LyN; Sun, 3 Apr 2016 19:35:25 +0200 (CEST) X-Auth-Info: 1MXEjaQRROgZxd1uIabDhDRsJxMG+dmHE2LvTnk9vcGlQgaKgff77RuHiK8bHtNI Original-Received: from igel.home (ppp-88-217-22-197.dynamic.mnet-online.de [88.217.22.197]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 3 Apr 2016 19:35:24 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id BA3532C3982; Sun, 3 Apr 2016 19:35:24 +0200 (CEST) X-Yow: .. are the STEWED PRUNES still in the HAIR DRYER? In-Reply-To: <83wpoepqjf.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 03 Apr 2016 20:09:56 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (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:202642 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: Ingo Lohmar , acm@muc.de, kaushal.modi@gmail.com, emacs-devel@gnu.org >> Date: Sun, 03 Apr 2016 18:24:33 +0200 >> >> Eli Zaretskii writes: >> >> > But we were talking about "git pull", not about merge. >> >> pull == fetch+merge. > > But "git help pull" != "git help fetch"+"git help merge". What's your point? pull has additional options. 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."