From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 20:34:52 +0100 Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458675322 18805 80.91.229.3 (22 Mar 2016 19:35:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:35:22 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:35:12 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 1aiS58-0002QP-H4 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:35:10 +0100 Original-Received: from localhost ([::1]:39212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS57-000810-Qe for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:35:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS55-0007zr-43 for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:35:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiS51-0002Uc-Tj for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:35:07 -0400 Original-Received: from hermes.netfonds.no ([80.91.224.195]:48490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS51-0002SU-NZ; Tue, 22 Mar 2016 15:35:03 -0400 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.84_2) (envelope-from ) id 1aiS4r-0003wR-4u; Tue, 22 Mar 2016 20:34:55 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEV5RjuVoI4DAQBNJCQQ CAkgERMGBAN79PfLAAACa0lEQVQ4jV2TTZLiMAyF5TLMOq40cwCqm7VTjlkzjZx1aEccIB10/yPM sxN6qFFBCPqkp5/EpKrzcbMg2QZviaxxpMOTPLJpCWYtGedoGWatbgkBcWRDiXcNqa4yHyEEj/8w V4wWPS5zBaaDq+qbCpjlE+A9NDW2dc5UqSQiXwCnYDeR1Qj+fK8Z1lMV+QHZ7rXUKGVfQQ7S3VW/ yf8nFXLsDnr62Bo15glsRv960kyGVmdTFAF8zO7rqEf9buAwT5CJwr4rfR3fs9syitQIYLuvupWl SjWh1KoZtAJebiW4WbebDbrxRUrvy5+SEUrfhsQbst0Z4HJfriUDeyfsSsQ31Lkmyq3n1JYS2IEp YGzzWCQOLFMp4esKyq6oT85Z76aUSqs+/ACLhwrPW7o2uUr5Cq60WZt8D1FPvoA0jU9gkuUrltLG EV1NsTqtmL3JkVEth+hdJl4T7DSebweZsC4vuQK/6XMMjUh0bhRIhSdohKdwixkgS/QYPgHsUud2 C99cexPXZkzQSM2YdDTNIEKdie4AMDquYNBHdqw55p5RpmwpEd8oqHIyd31Mqcd7eUgyvi3EF+vv ymzOqgveV762e8k7pmW0YdAkphecoUJy6ZBLhk02YPBfG0h5mhjgakkweYcWYAAifQUpx+GCDe51 A8yRF6aUJA6J9n73D1y5ZsiEMawMK5ByLuKU8DzkrosuxY9LBZhxwhNkXoNXSzVFGGB41HO+gQcC +fJbiXFTz/MJn3lGlUHnx7kAGY4vdhqQf1KAiVdw+nyhBWDUei+veQDYTo/kB2rMR53x/cm4fq4x c2kKN/VX/wJrXtcAwPoScAAAAABJRU5ErkJggg== In-Reply-To: <83oaa64f7l.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Mar 2016 19:03:58 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 80.91.224.195 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:202096 Archived-At: 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".) In this instance, if he had done "git pull --rebase; git push" then no merge commit would have been pushed, and things would generally be less confusing. That rebase/push thing is what I do 99.9% of the time, and its the least noisy you can be when doing normal stuff. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no