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: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 20:09:56 +0300 Message-ID: <83wpoepqjf.fsf@gnu.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1459703441 28309 80.91.229.3 (3 Apr 2016 17:10:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 17:10:41 +0000 (UTC) Cc: acm@muc.de, i.lohmar@gmail.com, emacs-devel@gnu.org, kaushal.modi@gmail.com To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 19:10:35 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 1amlXn-0000kI-D0 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 19:10:35 +0200 Original-Received: from localhost ([::1]:54451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlXm-0007wt-JR for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 13:10:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlXg-0007ux-NU for emacs-devel@gnu.org; Sun, 03 Apr 2016 13:10:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amlXd-0002ny-AR for emacs-devel@gnu.org; Sun, 03 Apr 2016 13:10:28 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlXd-0002nu-70; Sun, 03 Apr 2016 13:10:25 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3496 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1amlXc-00058B-BL; Sun, 03 Apr 2016 13:10:24 -0400 In-reply-to: <8760vyzmm6.fsf@linux-m68k.org> (message from Andreas Schwab on Sun, 03 Apr 2016 18:24:33 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202641 Archived-At: > 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".