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: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 21:49:57 +0200 Message-ID: <831t7247iy.fsf@gnu.org> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> <83poum4g1y.fsf@gnu.org> <83oaa64f7l.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458676250 1180 80.91.229.3 (22 Mar 2016 19:50:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:50:50 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:50:49 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 1aiSKH-0004yw-Dr for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:50:49 +0100 Original-Received: from localhost ([::1]:39325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSKD-0004aB-KA for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:50:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSJq-0004Zz-MK for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:50:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiSJl-00073V-T3 for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:50:22 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSJl-00073O-QF; Tue, 22 Mar 2016 15:50:17 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4481 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiSJk-00011k-VW; Tue, 22 Mar 2016 15:50:17 -0400 In-reply-to: (message from Lars Magne Ingebrigtsen on Tue, 22 Mar 2016 20:34:52 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202101 Archived-At: > From: Lars Magne Ingebrigtsen > Cc: Stefan Monnier , emacs-devel@gnu.org > Date: Tue, 22 Mar 2016 20:34:52 +0100 > > Eli Zaretskii writes: > > > We've been through this: "git rebase" will cause much worse trouble if > > you have local merge-commits from feature branches. > > That's true, but that's a quite unusual thing to be doing. ("Unusual" > as in "most of the time most of the people who work on Emacs won't be > doing that".) I was explaining why _I_ don't want to use rebase when pulling from upstream. To understand that, you need to ask what _I_ do most of the time, not what others do. For me, working on a feature branch is entirely not unusual.