From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 10:18:14 -0400 Message-ID: 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 1459693130 7619 80.91.229.3 (3 Apr 2016 14:18:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 14:18:50 +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:18:42 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 1amirR-0000SU-DI for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 16:18:41 +0200 Original-Received: from localhost ([::1]:53653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amirQ-0004xo-Ho for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 10:18:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amirB-0004xi-Vu for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:18:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amir8-0001Gw-P8 for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:18:25 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:58897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amir8-0001Gq-Hq for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:18:22 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1amir7-0000LL-6E for emacs-devel@gnu.org; Sun, 03 Apr 2016 16:18:21 +0200 Original-Received: from 69-165-138-79.dsl.teksavvy.com ([69.165.138.79]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 16:18:21 +0200 Original-Received: from monnier by 69-165-138-79.dsl.teksavvy.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 16:18:21 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 15 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 69-165-138-79.dsl.teksavvy.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) Cancel-Lock: sha1:2zJxHdfKynqJqDYhgxRgFG/9VDw= 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:202623 Archived-At: >> 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. Stefan