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 19:03:58 +0200 Message-ID: <83oaa64f7l.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458666284 32720 80.91.229.3 (22 Mar 2016 17:04:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 17:04:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 18:04:44 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 1aiPjV-0000L6-Kb for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 18:04:41 +0100 Original-Received: from localhost ([::1]:38492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPjV-00008B-0H for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 13:04:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPjE-000059-Gz for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:04:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPj8-0006D0-TA for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:04:24 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPj8-0006Cv-PX; Tue, 22 Mar 2016 13:04:18 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4206 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiPj8-0001Cl-0E; Tue, 22 Mar 2016 13:04:18 -0400 In-reply-to: (message from Stefan Monnier on Tue, 22 Mar 2016 12:52:48 -0400) 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:202081 Archived-At: > From: Stefan Monnier > Date: Tue, 22 Mar 2016 12:52:48 -0400 > > >> > . Phillip then said "git pull", followed by "git push". > >> That's a problem in itself, since it leads to annoying commit diffs that > >> repeat other things, and it changes "git log" ordering in confusing ways > >> (makes it seem like mainline's development is Philip's and when happened > >> on master during this time was done on a branch). > > Indeed. But sometimes this cannot be avoided, because no matter how > > quick you are, there's always a chance that someone else pushes > > between your local commit and your push. The probability of this > > could be brought down significantly by "git pull" before the local > > commit, but it cannot be eliminated altogether. > > "git rebase" should do the trick. We've been through this: "git rebase" will cause much worse trouble if you have local merge-commits from feature branches. So I at least will never use "git rebase" unless I have no other choice. When we started using Git, I explicitly asked whether we cared about the messed-up DAG due to these merge-commits, and the answer was "we don't". So I never looked back, and I guess others didn't, too.