From: <tomas@tuxteam.de>
To: Tassilo Horn <tsdh@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk
Date: Tue, 2 Feb 2021 10:06:32 +0100 [thread overview]
Message-ID: <20210202090632.GA26805@tuxteam.de> (raw)
In-Reply-To: <87pn1jx91p.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
On Tue, Feb 02, 2021 at 07:38:59AM +0100, Tassilo Horn wrote:
> Richard Stallman <rms@gnu.org> 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?
[...]
> 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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2021-02-02 9:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210131223952.429.10439@vcs0.savannah.gnu.org>
[not found] ` <20210131223954.A429420DF3@vcs0.savannah.gnu.org>
2021-02-02 0:44 ` master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk Katsumi Yamaoka
2021-02-02 2:58 ` Stefan Monnier
2021-02-02 5:41 ` Richard Stallman
2021-02-02 6:38 ` Tassilo Horn
2021-02-02 9:06 ` tomas [this message]
2021-02-02 15:23 ` Eli Zaretskii
2021-02-02 16:01 ` tomas
2021-02-02 16:21 ` Eli Zaretskii
2021-02-02 16:34 ` git things [was: master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk] tomas
2021-02-03 5:51 ` master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk Richard Stallman
2021-02-02 8:16 ` Andreas Schwab
2021-02-02 15:06 ` Eli Zaretskii
2021-02-03 5:52 ` Richard Stallman
2021-02-03 14:32 ` Eli Zaretskii
2021-02-04 5:47 ` Richard Stallman
2021-02-02 9:05 ` Lars Ingebrigtsen
2021-02-02 14:43 ` Stefan Monnier
2021-02-02 14:53 ` Lars Ingebrigtsen
2021-02-02 22:12 ` Katsumi Yamaoka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210202090632.GA26805@tuxteam.de \
--to=tomas@tuxteam.de \
--cc=emacs-devel@gnu.org \
--cc=tsdh@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.