From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Sun, 26 Mar 2017 08:03:01 -0500 Message-ID: <86r31k5gxm.fsf@stephe-leake.org> References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> <58D637CD.1020902@gmx.at> <60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu> <58D77E12.2060805@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490533392 11215 195.159.176.226 (26 Mar 2017 13:03:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 26 Mar 2017 13:03:12 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 26 15:03:08 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cs7p6-0002Xc-3F for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 15:03:08 +0200 Original-Received: from localhost ([::1]:40960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cs7pC-0002jD-4d for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 09:03:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cs7p6-0002j5-BB for emacs-devel@gnu.org; Sun, 26 Mar 2017 09:03:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cs7p3-00047Y-9N for emacs-devel@gnu.org; Sun, 26 Mar 2017 09:03:08 -0400 Original-Received: from smtp137.dfw.emailsrvr.com ([67.192.241.137]:54788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cs7p3-00047J-4v for emacs-devel@gnu.org; Sun, 26 Mar 2017 09:03:05 -0400 Original-Received: from smtp18.relay.dfw1a.emailsrvr.com (localhost [127.0.0.1]) by smtp18.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id B130CC00F7 for ; Sun, 26 Mar 2017 09:03:03 -0400 (EDT) X-Auth-ID: board-president@tomahawk-creek-hoa.com Original-Received: by smtp18.relay.dfw1a.emailsrvr.com (Authenticated sender: board-president-AT-tomahawk-creek-hoa.com) with ESMTPSA id 8742FC00B2 for ; Sun, 26 Mar 2017 09:03:03 -0400 (EDT) X-Sender-Id: board-president@tomahawk-creek-hoa.com Original-Received: from Takver4 (76-218-37-33.lightspeed.kscymo.sbcglobal.net [76.218.37.33]) (using TLSv1.2 with cipher AES128-GCM-SHA256) by 0.0.0.0:587 (trex/5.7.12); Sun, 26 Mar 2017 09:03:03 -0400 In-Reply-To: <58D77E12.2060805@gmx.at> (martin rudalics's message of "Sun, 26 Mar 2017 10:38:42 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 67.192.241.137 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:213358 Archived-At: martin rudalics writes: >> That sounds wrong. It never happens to me, I expect because my >> workflow differs. Can you give a way to reproduce your problem? >> Perhaps there's a way we can fix the Git configuration so that it >> doesn't happen to you in the future. > > It might be related to the fact that I use git entirely from within > Emacs, git tells me that my terminal is dumb and explicitly asks me to > commit what I pulled even when there were no conflicts. That sounds like line ending mismatch. -- -- Stephe