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 09:00:26 +0100 Organization: Probably a good idea Message-ID: References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <87zj707jca.fsf@bernoul.li> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427356846 22778 80.91.229.3 (26 Mar 2015 08:00:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 08:00:46 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 09:00: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 1Yb2iS-0006il-Pn for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 09:00:36 +0100 Original-Received: from localhost ([::1]:43253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb2iS-00007y-5q for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 04:00:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb2iC-00007p-V4 for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:00:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb2i7-0003lE-SZ for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:00:20 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb2i7-0003jH-LK for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:00:15 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Yb2i0-0006RW-TG for emacs-devel@gnu.org; Thu, 26 Mar 2015 09:00:09 +0100 Original-Received: from rainey.bang.priv.no ([212.110.185.190]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Mar 2015 09:00:08 +0100 Original-Received: from sb by rainey.bang.priv.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Mar 2015 09:00:08 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 14 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: rainey.bang.priv.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:Ck2jkTiqVvgrSN0pQTm6Ypso5n0= 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:184280 Archived-At: >>>>> Jonas Bernoulli : > (And several people here implying that those of us who have embraced > the staging area suffer from Stockholm syndrome certainly doesn't > motivate me to rethink this decision). FWIW the way magit displays the staging area are one of the things that makes it really useful to me. The way magit displays a merge with conflicts, and makes me work with the conflicts, makes it my favourite tool for resolving the conflicts. I even use it for merges that have no conflicts. It's the quickest way to walk the staged files and examining the diffs, before I commit.