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 21:04:00 +0300 Message-ID: <83r3empo1b.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> <83wpoepqjf.fsf@gnu.org> <871t6mzjc3.fsf@linux-m68k.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1459706682 10474 80.91.229.3 (3 Apr 2016 18:04:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 18:04:42 +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 20:04:37 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 1ammO4-0007VE-N1 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 20:04:36 +0200 Original-Received: from localhost ([::1]:54632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ammO3-00073A-Nf for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 14:04:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ammO0-000733-MM for emacs-devel@gnu.org; Sun, 03 Apr 2016 14:04:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ammNx-00061d-Fn for emacs-devel@gnu.org; Sun, 03 Apr 2016 14:04:32 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ammNx-00061Z-Bv; Sun, 03 Apr 2016 14:04:29 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3650 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ammNw-0005ME-CU; Sun, 03 Apr 2016 14:04:28 -0400 In-reply-to: <871t6mzjc3.fsf@linux-m68k.org> (message from Andreas Schwab on Sun, 03 Apr 2016 19:35:24 +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:202643 Archived-At: > From: Andreas Schwab > Cc: i.lohmar@gmail.com, acm@muc.de, kaushal.modi@gmail.com, emacs-devel@gnu.org > Date: Sun, 03 Apr 2016 19:35:24 +0200 > > 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. My point is that we were talking about "git pull", and therefore the relevant documentation is the man page of "pull", not of "merge". The man page of "pull" no longer warns about pulling when there are uncommitted changes.