From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Sun, 26 Mar 2017 22:16:44 +0300 Message-ID: <83vaqv97c3.fsf@gnu.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> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> <58D637CD.1020902@gmx.at> <60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu> <83o9wpbbbh.fsf@gnu.org> <58D77E36.5060300@gmx.at> <83tw6g9l4g.fsf@gnu.org> <58D8101C.3070204@gmx.at> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1490555836 13219 195.159.176.226 (26 Mar 2017 19:17:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 26 Mar 2017 19:17:16 +0000 (UTC) Cc: eggert@cs.ucla.edu, stephen_leake@stephe-leake.org, emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 26 21:17:10 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 1csDeu-0001uV-T9 for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 21:17:01 +0200 Original-Received: from localhost ([::1]:42014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDez-0004mu-Bs for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 15:17:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDes-0004mn-An for emacs-devel@gnu.org; Sun, 26 Mar 2017 15:16:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csDeo-0000kI-63 for emacs-devel@gnu.org; Sun, 26 Mar 2017 15:16:58 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csDeo-0000kD-2x; Sun, 26 Mar 2017 15:16:54 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3045 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1csDel-0002Lz-Hw; Sun, 26 Mar 2017 15:16:53 -0400 In-reply-to: <58D8101C.3070204@gmx.at> (message from martin rudalics on Sun, 26 Mar 2017 21:01:48 +0200) 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.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:213388 Archived-At: > Date: Sun, 26 Mar 2017 21:01:48 +0200 > From: martin rudalics > CC: eggert@cs.ucla.edu, stephen_leake@stephe-leake.org, > emacs-devel@gnu.org > > > I'm not sure I follow: are you saying that you use "git pull" into > > local branches that don't track the master branch? If so, why are you > > doing that? > > Doing what? I have three versions of master - one pristine, one used > for development with changes I eventually intend to push, and a private > one with changes I don't intend to push. For the non-pristine ones I > practically always pull into the branch and only occasionally pull into > the master, usually when I want to make a diff. Is that bad? Are the non-pristine branches tracking master, or are they different branches forked from master? If the latter, you shouldn't be pulling into them, I think, you should be merging from master.