From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 18:34:21 -0400 Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427409288 27334 80.91.229.3 (26 Mar 2015 22:34:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 22:34:48 +0000 (UTC) Cc: Steinar Bang , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 23:34:38 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 1YbGMD-0000X6-Kx for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 23:34:33 +0100 Original-Received: from localhost ([::1]:46844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbGMC-0006HP-MN for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 18:34:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbGM9-0006H9-Ik for emacs-devel@gnu.org; Thu, 26 Mar 2015 18:34:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbGM8-0002yd-TU for emacs-devel@gnu.org; Thu, 26 Mar 2015 18:34:29 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:18978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbGM4-0002wx-GO; Thu, 26 Mar 2015 18:34:24 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aj4LAGvvdVRBbthL/2dsb2JhbAA3gVOhHAFSgQiBdQEBBAFWIwULCzQSFBgNJIgTohGLdSYIQQkBAgECgiFYRQODcASoOw X-IPAS-Result: Aj4LAGvvdVRBbthL/2dsb2JhbAA3gVOhHAFSgQiBdQEBBAFWIwULCzQSFBgNJIgTohGLdSYIQQkBAgECgiFYRQODcASoOw X-IronPort-AV: E=Sophos;i="5.01,1,1400040000"; d="scan'208";a="114691797" Original-Received: from 65-110-216-75.cpe.pppoe.ca (HELO pastel.home) ([65.110.216.75]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 26 Mar 2015 18:34:22 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 9A75B2441; Thu, 26 Mar 2015 18:34:21 -0400 (EDT) In-Reply-To: <83k2y3mrjk.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 26 Mar 2015 22:29:03 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:184352 Archived-At: >> Is that configurable? Not currently, no. >> It sounds like a step I would like to control myself. There's a (recentish) bug report about that, indeed. > 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. Stefan