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 22:59:30 +0300 Message-ID: <83egoa1aal.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> <83fv8qnbrk.fsf@gnu.org> <86mw2yqln6.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427486393 25436 80.91.229.3 (27 Mar 2015 19:59:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 19:59: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 Fri Mar 27 20:59:45 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 1YbaPw-0005wx-IL for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 20:59:44 +0100 Original-Received: from localhost ([::1]:51696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaPv-0002qu-UC for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 15:59:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaPp-0002ps-JT for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:59:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbaPl-0001nE-K4 for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:59:37 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:60556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbaPl-0001n0-CX for emacs-devel@gnu.org; Fri, 27 Mar 2015 15:59:33 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NLV00700Z04N300@mtaout25.012.net.il> for emacs-devel@gnu.org; Fri, 27 Mar 2015 22:54:40 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLV005STZB4QR20@mtaout25.012.net.il>; Fri, 27 Mar 2015 22:54:40 +0300 (IDT) In-reply-to: <86mw2yqln6.fsf@dod.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.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:184430 Archived-At: > From: Steinar Bang > Date: Fri, 27 Mar 2015 20:35:09 +0100 > > >>>>> Eli Zaretskii : > > > It wasn't clear from the question what needs to be configurable. > > I just wanted to switch off the automatic "git add" bit. Then I wonder why you'd want smerge-mode at all.