From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 16:49:25 +0200 Message-ID: <87mvpa3fyi.fsf@wanadoo.es> References: <56FE1882.9030904@cs.ucla.edu> <20160403120300.GB3537@acm.fritz.box> <8760vy6gfi.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459695003 2413 80.91.229.3 (3 Apr 2016 14:50:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 14:50:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 16:49:54 2016 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 1amjLe-0005bl-HZ for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 16:49:54 +0200 Original-Received: from localhost ([::1]:53755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjLe-0004D2-1N for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 10:49:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjLP-0004C4-DL for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:49:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amjLL-00087V-Aq for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:49:39 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:59891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjLL-00087R-3w for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:49:35 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1amjLJ-0005To-QG for emacs-devel@gnu.org; Sun, 03 Apr 2016 16:49:33 +0200 Original-Received: from 151.red-79-153-146.dynamicip.rima-tde.net ([79.153.146.151]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 16:49:33 +0200 Original-Received: from ofv by 151.red-79-153-146.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 16:49:33 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 151.red-79-153-146.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) Cancel-Lock: sha1:6EVoTSXs7eibxSMEYIVhrldpLwo= 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:202627 Archived-At: Stefan Monnier writes: >>> It was git that prepared the merge, not me. >> Blaming the tools? > > Yes. Git makes it all too easy here to create such annoying merge > commits, and if you don't have enough experience with Git you won't > even notice it. > > But even if you do notice it, it can be pretty challenging to fix it > after the fact, or to avoid it before the fact. > > It's not just that Git is a sharp tool here: in this instance, it makes > it easy to do the wrong thing, and hard to do the right thing. I know I sound like a broken record, but if the UI of git is not adequate for you then try other UI. I'll suggest Magit, which makes all those operations trivial to work with. It requires Emacs to run, which is a fat dependency, but it is worth the disk space IMHO. The downside is that you might have much less problems with git on the future, and hence your view about that tool could change a bit and complain less about it on the ml. You must ponder what causes more pleasure to you: disparage git or get the job done. :-)