From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 3 Apr 2016 13:02:39 -0700 Organization: UCLA Computer Science Department Message-ID: <570176DF.1060207@cs.ucla.edu> References: <56FE1882.9030904@cs.ucla.edu> <20160403120300.GB3537@acm.fritz.box> <8760vy6gfi.fsf@Rainer.invalid> <871t6m5zjq.fsf@Rainer.invalid> <87wpoey1ij.fsf@linux-m68k.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1459713802 17208 80.91.229.3 (3 Apr 2016 20:03:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 20:03:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 22:03:05 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 1amoEj-0000gS-4V for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 22:03:05 +0200 Original-Received: from localhost ([::1]:55065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amoEi-0001m0-E9 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 16:03:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amoEf-0001kL-67 for emacs-devel@gnu.org; Sun, 03 Apr 2016 16:03:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amoEb-00044G-4x for emacs-devel@gnu.org; Sun, 03 Apr 2016 16:03:01 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:35704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amoEa-000448-VQ for emacs-devel@gnu.org; Sun, 03 Apr 2016 16:02:57 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 6B0FE161242; Sun, 3 Apr 2016 13:02:55 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 2QBwYItxDcL6; Sun, 3 Apr 2016 13:02:54 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id BAFD2161249; Sun, 3 Apr 2016 13:02:54 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CB0Ef4ifPu2t; Sun, 3 Apr 2016 13:02:54 -0700 (PDT) Original-Received: from [192.168.1.9] (unknown [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 9D210161242; Sun, 3 Apr 2016 13:02:54 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <87wpoey1ij.fsf@linux-m68k.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:202649 Archived-At: Andreas Schwab wrote: > Rebase should never be the default, because it is more complicated and > harder to get right. It creates new commits that each must be retested. Rebasing makes sense for Alan's use case. He was working on the fix anyway, so retesting was not that big a deal for him. Conversely, he's more of an Emacs expert than a Git expert and merge conflicts are more of an hassle for him. This particular case did not benefit much from the advantages of merging over rebasing; quite the contrary. As one becomes more of a Git expert, merging becomes more attractive. It does take some getting used to, though.