From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk Date: Tue, 02 Feb 2021 07:38:59 +0100 Message-ID: <87pn1jx91p.fsf@gnu.org> References: <20210131223952.429.10439@vcs0.savannah.gnu.org> <20210131223954.A429420DF3@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36942"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.5.8; emacs 28.0.50 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Feb 02 07:46:07 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l6pRu-0009Tc-NM for ged-emacs-devel@m.gmane-mx.org; Tue, 02 Feb 2021 07:46:06 +0100 Original-Received: from localhost ([::1]:59568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6pRt-0004Py-Pt for ged-emacs-devel@m.gmane-mx.org; Tue, 02 Feb 2021 01:46:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6pR2-0003zK-5Z for emacs-devel@gnu.org; Tue, 02 Feb 2021 01:45:12 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:41115) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6pR1-0001h2-Ug for emacs-devel@gnu.org; Tue, 02 Feb 2021 01:45:11 -0500 Original-Received: from auth1-smtp.messagingengine.com ([66.111.4.227]:56925) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1l6pR1-0001mm-89 for emacs-devel@gnu.org; Tue, 02 Feb 2021 01:45:11 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 08A7027C0054 for ; Tue, 2 Feb 2021 01:45:10 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Feb 2021 01:45:11 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeelgdelvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfhgfhffvufffjgfkgggtsehttdertd dtredtnecuhfhrohhmpefvrghsshhilhhoucfjohhrnhcuoehtshguhhesghhnuhdrohhr gheqnecuggftrfgrthhtvghrnhepveevieekteekveeigfefffeivdetgeduvdffueeuud evgedttdehvdfhueevfffhnecukfhppeekgedrudefvddruddthedrudegudenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhorhhnodhmvg hsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdekieejfeekjeekgedqieefhedvleek qdhtshguhheppehgnhhurdhorhhgsehfrghsthhmrghilhdrfhhm X-ME-Proxy: Original-Received: from thinkpad-t440p (p5484698d.dip0.t-ipconnect.de [84.132.105.141]) by mail.messagingengine.com (Postfix) with ESMTPA id 3B27A1080068 for ; Tue, 2 Feb 2021 01:45:10 -0500 (EST) In-reply-to: X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:263706 Archived-At: Richard Stallman writes: > [[[ To any NSA and FBI agents reading my email: please consider ]]] > [[[ whether defending the US Constitution against all enemies, ]]] > [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > Would someone please tell me what "remote tracking" means, concretely? > What does that branch do? You most probably have at least the branches origin/master and master in your local git checkout. The origin/master branch is a remote-tracking branch because it tracks the state of the corresponding master branch on the origin (savannah) side. That means, it'll be updated whenever you run "git fetch" and represents the exact state of the master branch on savannah of the last "git fetch". Your master branch is basically a copy of origin/master which is not automatically updated unless you tell it using "git pull" (or by merging or rebasing onto origin/master). That is, it may be less current than origin/master and may also diverge from in in which case you need to merge or rebase in order to be allowed push. Bye, Tassilo