From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Fri, 27 Mar 2015 20:30:34 +0100 Organization: Probably a good idea Message-ID: <86sicqqlut.fsf@dod.no> 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 1427485854 16755 80.91.229.3 (27 Mar 2015 19:50:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 19:50:54 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 20:50:50 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 1YbaHI-0007gu-3m for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 20:50:48 +0100 Original-Received: from localhost ([::1]:51660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaHH-0004Oc-KH for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 15:50:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaGk-0004Ht-Lz for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:50:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbaGf-00073b-Hd for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:50:14 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaGf-00073Q-Ah for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:50:09 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YbaFA-0006Jc-5F for emacs-devel@gnu.org; Fri, 27 Mar 2015 20:48:36 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Mar 2015 20:48:36 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Mar 2015 20:48:36 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 32 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Mail-Copies-To: never Cancel-Lock: sha1:dx+D8t0A41qII+sz0jS/x7mSCcs= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184428 Archived-At: >>>>> Eli Zaretskii : >> From: Steinar Bang >> > 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. Ok, it'll be a while until I see it, then. (Gnus and org comes from git, but my emacs is the newest released version) >> 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.) It's just I like to inspect before I stage. Force of habit, I guess... (Another thing is that when I go back to magit it won't have display the staged file, and it feels like more correct to do 's' to stage the file, instead of 'g' to refresh magit) Nothing important in other words.