From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Thu, 23 Mar 2017 11:44:34 -0400 Message-ID: References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490283924 22279 195.159.176.226 (23 Mar 2017 15:45:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 23 Mar 2017 15:45:24 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 23 16:45:18 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cr4vM-0004wl-IP for ged-emacs-devel@m.gmane.org; Thu, 23 Mar 2017 16:45:16 +0100 Original-Received: from localhost ([::1]:57071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr4vQ-00022F-P4 for ged-emacs-devel@m.gmane.org; Thu, 23 Mar 2017 11:45:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr4ur-000228-0e for emacs-devel@gnu.org; Thu, 23 Mar 2017 11:44:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cr4un-0007jv-3K for emacs-devel@gnu.org; Thu, 23 Mar 2017 11:44:45 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:37066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr4um-0007jW-Tu for emacs-devel@gnu.org; Thu, 23 Mar 2017 11:44:41 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id v2NFiWIl024650; Thu, 23 Mar 2017 11:44:33 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 56CF4602C6; Thu, 23 Mar 2017 11:44:34 -0400 (EDT) In-Reply-To: <58D3C84E.5080808@gmx.at> (martin rudalics's message of "Thu, 23 Mar 2017 14:06:22 +0100") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV5980=0 X-NAI-Spam-Version: 2.3.0.9418 : core <5980> : inlines <5755> : streams <1738202> : uri <2397316> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:213272 Archived-At: >>> + 917ce99...5aa9a80 scratch/record -> origin/scratch/record (forced update) >>> Couldn't we recommend that people don't use forced pushes - even on >>> scratch branches? >> Why? > It's distracting for people like me who don't understand git. Today it > confused me enough that I messed up the ChangeLog of my commit and did > not notice it before pushing. Hmmm... I can't see how that could happen if you don't actually use that branch, so I guess you've merged from that branch and tried to re-merge? > Also reading about it on the net is not very reassuring either. > But if you think that it's essential I'll have to get used to it. It's not essential, but some people like to keep branches as a clean set of patches on top of master, so they regularly rebase (and reorganize the set of patches), so in the end it doesn't give you the path that was followed to get there (which, while historically accurate, tends to be messy and hard to follow) but only "a nice path to get there", which is basically a single patch divided into a few commented logical steps. Stefan