From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Newsgroups: gmane.emacs.devel Subject: Re: master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk Date: Tue, 2 Feb 2021 10:06:32 +0100 Message-ID: <20210202090632.GA26805@tuxteam.de> References: <20210131223952.429.10439@vcs0.savannah.gnu.org> <20210131223954.A429420DF3@vcs0.savannah.gnu.org> <87pn1jx91p.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="liOOAslEiF7prFVr" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23607"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mutt/1.5.21 (2010-09-15) Cc: emacs-devel@gnu.org To: Tassilo Horn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Feb 02 10:09:21 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 1l6rgX-00062g-Ax for ged-emacs-devel@m.gmane-mx.org; Tue, 02 Feb 2021 10:09:21 +0100 Original-Received: from localhost ([::1]:34416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6rgW-00057W-DF for ged-emacs-devel@m.gmane-mx.org; Tue, 02 Feb 2021 04:09:20 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6rdw-0003n8-5U for emacs-devel@gnu.org; Tue, 02 Feb 2021 04:06:40 -0500 Original-Received: from mail.tuxteam.de ([5.199.139.25]:60241) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.90_1) (envelope-from ) id 1l6rdt-0008Kn-VF; Tue, 02 Feb 2021 04:06:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tuxteam.de; s=mail; h=From:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date; bh=FkeYajMl4OqGl1Q17voAlXxlZ2Ccs5iZ06PQuV+SF/U=; b=K66oow7oNNSvcBYbEL8M/S0siAI1BawVERc8xinWgfJTOR1ODm4+2Tug4F8Na31Ys+EBCF+kVYxv9Z1fGWh+Q6+Us32JfJk3YZcHeRFlHGJJ94qhikZbal1ndc90HA3T0NDVoYuHuJq4CmbDKh1RydpKa1UIIcYreTWyehImYNndttqsDo4U/jUzRla0pL6vk92Z4GgYrQPF0wetKgs5yTDa9qEBvH/xUfrUWnU5lGneQdmqkuhd2thCptMhU1QDiVM0KDygyOKKHbjjVfx/zIOtXCXMUyJeIye2KFo+V6Rd0pw/vUsOBiXE1Fl6lnHJ2wQLm+kZb2CzMy2rWg6sug==; Original-Received: from tomas by mail.tuxteam.de with local (Exim 4.80) (envelope-from ) id 1l6rdo-0007Pn-FS; Tue, 02 Feb 2021 10:06:32 +0100 Content-Disposition: inline In-Reply-To: <87pn1jx91p.fsf@gnu.org> Received-SPF: pass client-ip=5.199.139.25; envelope-from=tomas@tuxteam.de; helo=mail.tuxteam.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:263712 Archived-At: --liOOAslEiF7prFVr Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 02, 2021 at 07:38:59AM +0100, Tassilo Horn wrote: > Richard Stallman writes: >=20 > > [[[ 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? [...] > 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). Just in case the above is unclear: you usually don't *want* "your" master (or main, or devel) branch automatically updated, since you (typically) will have made changes to them. You want to do an explicit merge, at a time you are prepared to sort out the conflicts which may arise. Consider the "tracking" branches (origin/master, origin/main, or whatever) as a cache of sorts for the remote repository "origin". The nice thing about git is that it makes those things explicit [1]. It may be confusing at the beginning, but it gives you way more freedom in the long run. Cheers [1] Caches are typically "implicit". You don't see the cache itself, things are just "magically" faster. To inspect the cache, you are supposed to buy the "pro kit", i.e. some debugger. Some implementations go the extra mile to make it difficult for the users to "see" the cache: they take the adage "information hiding" literally (too literally, for my taste ;-) - t --liOOAslEiF7prFVr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAmAZFhgACgkQBcgs9XrR2kaaEACeNEWuPohjJ50yCbvWHD746dja jzwAn25A7cZI4PU25UeCjSxYDRTQDB9/ =Fxtf -----END PGP SIGNATURE----- --liOOAslEiF7prFVr--