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: git is screwed Date: Fri, 27 Mar 2015 10:24:31 +0300 Message-ID: <83fv8qnbrk.fsf@gnu.org> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> <5513E96D.8070204@math.ntnu.no> <83twx7n0zz.fsf@gnu.org> <86a8yzshst.fsf@dod.no> <83k2y3mrjk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427441115 18192 80.91.229.3 (27 Mar 2015 07:25:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 07:25:15 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 08:25:06 2015 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 1YbOdZ-00029K-AJ for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 08:25:01 +0100 Original-Received: from localhost ([::1]:47993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbOdY-00012P-JL for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 03:25:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbOdC-00010M-VP for emacs-devel@gnu.org; Fri, 27 Mar 2015 03:24:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbOd9-0005l1-E3 for emacs-devel@gnu.org; Fri, 27 Mar 2015 03:24:38 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:58529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbOd9-0005kR-4l for emacs-devel@gnu.org; Fri, 27 Mar 2015 03:24:35 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NLV001000APHQ00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 27 Mar 2015 10:24:33 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLV001150KXH630@a-mtaout21.012.net.il>; Fri, 27 Mar 2015 10:24:33 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:184364 Archived-At: > From: Stefan Monnier > Cc: Steinar Bang , emacs-devel@gnu.org > Date: Thu, 26 Mar 2015 18:34:21 -0400 > > > It's a minor mode, so of course it's configurable: just switch it off. > > The "git add" part is independent from smerge-mode (tho they're linked > by the fact that they both depend on the VC backend being able to > recognize that a file has conflicts). So turning smerge-mode off won't help. It wasn't clear from the question what needs to be configurable. There was another advice, which you elided, that would disable "git add" as well.