From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Mon, 27 Mar 2017 21:29:43 +0200 Message-ID: <58D96827.8060800@gmx.at> 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> <83o9wpbbbh.fsf@gnu.org> <58D77E36.5060300@gmx.at> <83tw6g9l4g.fsf@gnu.org> <58D8101C.3070204@gmx.at> <83vaqv97c3.fsf@gnu.org> <58D8178F.3020300@gmx.at> <83fuhy93f1.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1490643055 3159 195.159.176.226 (27 Mar 2017 19:30:55 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 27 Mar 2017 19:30:55 +0000 (UTC) Cc: eggert@cs.ucla.edu, stephen_leake@stephe-leake.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 27 21:30:51 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 1csaLi-0007ut-B9 for ged-emacs-devel@m.gmane.org; Mon, 27 Mar 2017 21:30:42 +0200 Original-Received: from localhost ([::1]:48640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csaLm-0002ff-OY for ged-emacs-devel@m.gmane.org; Mon, 27 Mar 2017 15:30:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csaLH-0002fP-2k for emacs-devel@gnu.org; Mon, 27 Mar 2017 15:30:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csaLE-0000hZ-FP for emacs-devel@gnu.org; Mon, 27 Mar 2017 15:30:15 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:49877) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1csaLE-0000gc-4d; Mon, 27 Mar 2017 15:30:12 -0400 Original-Received: from [192.168.1.100] ([213.162.68.78]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M7pDs-1bxTXM127U-00vS7c; Mon, 27 Mar 2017 21:29:52 +0200 In-Reply-To: <83fuhy93f1.fsf@gnu.org> X-Provags-ID: V03:K0:gZVssJHUI7fb/RNo4YyRPiBhFvvzH6z9wBu4zTWnNTvrZWZyPHr VToisx7v0E9hL/RYxCz4ynnX/7pbXya0y4CPCkAEjT7NXp2PkyXv9sr1M+L+MQjVZ3SwQYr UOkHU1Zwyw/jVODnDZRSZGDW+fKVwNcAB642LPZchk83fLjOIVA5s99Ds6w+dTKwZYBadzN uDD/aVf2t5U+ggOU9M2xQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:9AqVbiz7THU=:21UYDyt0QD1sbvigZnTOH2 JGE76VItPBE1JXjHY22HtWc9a73CSPVZNiLWwLIQpuhaj3En4EoZuxPUUkWm8YDwxdVEbQ3Ho FCmp5avKjZRTK13i7hSx9Ed3YWGZZUCBfKUHmwQz8fn1wBVk2irnMcYWTxhapX6sgfALUgzZw jmDM0WmO6A93Lo6JlxJvEfinbk0E2JdZ4FVk2YOBxscvLb1Lfp3D9QliVAH/t5AjhvGQsnJLO BsG5vvR8tZS2H/69D2xTrUszGLPZAYBSBm9z8jN0wYsznntT1dUdxkdXRekTbVVydGT1pFyRf QBmbVhh7buBjCs4H4Ik/vmFM0JtAuc+n1433rFruP4zcH2rGOGL40Bp/FO6bWifjTS4ONO01X rybEYhYbpLktP9cf++pb72GGU/yFV1XgXpDmn6KV/+d2gdyqYYhK6Po4NJDFUBe21JGROELCO LDNw15xqKNS2fYRy/wreu/iljW8uvS8VzMF3l5XyGgHkNBBbvWTsgGfa5a3VQnBUjXBwIHvNa ZPnFA4jbhb83Ba6vssVS4daGeRGGvyG3qxkhctQdfn8m5TNx19zZ8tqydRn2FO4Xk3dWevzOF 8JlqxnRcGfOJcLb/YrQfb8BVxewcFuIXpyz2Xn0R3Lfu1LPJvEUg1iCrlykh4PeJnt/ROTRxc acNxgkxE9eKxoNKDhadTpAaa1Mic7bAlpI86wPrkeCZ0c1295T1eBrJCme28Y0XYOEQdIJiWF edoaZLF2yEHhOnGPfwAMRftNGllysrooUMVQWtTpnBYacG9ox74qs9gaPjcn5PbkHyukWLTN X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.15 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:213427 Archived-At: > Then I don't understand why Git would force you to commit. IME, it > happens only when the pulled changes modify the same places as your > uncommitted changes. And even then I'm given a choice of committing > or stashing; the latter will allow to leave your changes uncommitted, > if you "git stash pop" after pulling. That's been my experience too. For some reason either the merge or the autocommit fails. Sometimes because git detects trailing whitespace in the pulled code. Other times without telling me any reason but that my terminal is dumb. > What version of Git do you have installed? 1.7.10.4 martin