From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Fri, 24 Mar 2017 12:56:29 -0500 Message-ID: <86vaqypnhu.fsf@stephe-leake.org> 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 1490378258 23281 195.159.176.226 (24 Mar 2017 17:57:38 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 24 Mar 2017 17:57:38 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 24 18:57:34 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 1crTSm-0004iN-Hg for ged-emacs-devel@m.gmane.org; Fri, 24 Mar 2017 18:57:24 +0100 Original-Received: from localhost ([::1]:34347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crTSs-0007Ap-K3 for ged-emacs-devel@m.gmane.org; Fri, 24 Mar 2017 13:57:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crTS9-00079J-J9 for emacs-devel@gnu.org; Fri, 24 Mar 2017 13:56:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crTS4-0006Ka-Kr for emacs-devel@gnu.org; Fri, 24 Mar 2017 13:56:45 -0400 Original-Received: from smtp153.ord.emailsrvr.com ([173.203.6.153]:51103) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crTS4-0006Hg-Gx for emacs-devel@gnu.org; Fri, 24 Mar 2017 13:56:40 -0400 Original-Received: from smtp28.relay.ord1a.emailsrvr.com (localhost [127.0.0.1]) by smtp28.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 9F521A011C for ; Fri, 24 Mar 2017 13:56:33 -0400 (EDT) X-Auth-ID: board-president@tomahawk-creek-hoa.com Original-Received: by smtp28.relay.ord1a.emailsrvr.com (Authenticated sender: board-president-AT-tomahawk-creek-hoa.com) with ESMTPSA id 6A595A00F0 for ; Fri, 24 Mar 2017 13:56:33 -0400 (EDT) X-Sender-Id: board-president@tomahawk-creek-hoa.com Original-Received: from Takver4 (76-218-37-33.lightspeed.kscymo.sbcglobal.net [76.218.37.33]) (using TLSv1.2 with cipher AES128-GCM-SHA256) by 0.0.0.0:587 (trex/5.7.12); Fri, 24 Mar 2017 13:56:33 -0400 In-Reply-To: (Stefan Monnier's message of "Thu, 23 Mar 2017 11:44:34 -0400") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 173.203.6.153 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:213304 Archived-At: Stefan Monnier writes: >>>> + 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. > 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. +1 People can do whatever they want on a "scratch" branch; that's what the name means. -- -- Stephe