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: Thu, 26 Mar 2015 20:02:58 +0100 Organization: Probably a good idea Message-ID: <86a8yzshst.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427396608 945 80.91.229.3 (26 Mar 2015 19:03:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 19:03:28 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 20:03:21 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 1YbD3g-0003Uh-TZ for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 20:03:13 +0100 Original-Received: from localhost ([::1]:46186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbD3g-0007zo-9Z for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 15:03:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbD3c-0007yJ-UL for emacs-devel@gnu.org; Thu, 26 Mar 2015 15:03:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbD3Z-0001gK-JE for emacs-devel@gnu.org; Thu, 26 Mar 2015 15:03:08 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:58419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbD3Z-0001fy-Bs for emacs-devel@gnu.org; Thu, 26 Mar 2015 15:03:05 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YbD3M-0003Gx-VS for emacs-devel@gnu.org; Thu, 26 Mar 2015 20:02:53 +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 ; Thu, 26 Mar 2015 20:02:52 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Mar 2015 20:02:52 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:/2HP5WEyNjJV7duvVk8HHeW7rew= 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:184348 Archived-At: >>>>> Eli Zaretskii : > What's wrong with smerge-mode? I haven't tried it yet. I just heard about it 24 days ago (the thread "smerge-mode is fantastic, but it annoys me"). > It should kick in automatically when you have conflict markers, Um... since when...? 24.4? Or git master HEAD? > 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.