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: Thu, 26 Mar 2015 22:29:03 +0200 Message-ID: <83k2y3mrjk.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427401853 30891 80.91.229.3 (26 Mar 2015 20:30:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 20:30:53 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 21:30:44 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 1YbEQB-0005gh-FF for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 21:30:31 +0100 Original-Received: from localhost ([::1]:46421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbEQA-0003mh-QI for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 16:30:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbEQ1-0003mT-HO for emacs-devel@gnu.org; Thu, 26 Mar 2015 16:30:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbEPx-0001cK-VG for emacs-devel@gnu.org; Thu, 26 Mar 2015 16:30:21 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:36880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbEPx-0001bd-Na for emacs-devel@gnu.org; Thu, 26 Mar 2015 16:30:17 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NLU0090061MON00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 26 Mar 2015 22:29:07 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLU009BI68J7SA0@a-mtaout22.012.net.il>; Thu, 26 Mar 2015 22:29:07 +0200 (IST) In-reply-to: <86a8yzshst.fsf@dod.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184351 Archived-At: > From: Steinar Bang > Date: Thu, 26 Mar 2015 20:02:58 +0100 > > > It should kick in automatically when you have conflict markers, > > Um... since when...? 24.4? Or git master HEAD? It needs support from the VC backend. It was working with bzr for a long time, but vc-git only has that support on master. > > and also invoke "git add" automatically for every file saved after > > resolving all of its conflicts. > > Is that configurable? It sounds like a step I would like to control > myself. It's a minor mode, so of course it's configurable: just switch it off. Or remove its hook from find-file-hook. (Not that I understand why would you want to.)