git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] glossary: improve "branch" definition

From
Sergey Organov <sorganov@gmail.com>
Date
Dec 2, 2020, 11:50 UTC
Message-ID
<877dq05swb.fsf@osv.gnss.ru>
In-Reply-To
<xmqqr1ojlkng.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 17 quoted lines
> Sergey Organov <sorganov@gmail.com> writes:
>
>>> But do we need to say "a separate line of development", instead of
>>> just "a line of development"?  What is "a line of development" that
>>> is not separate?  What extra pieces of information are we trying to
>>> convey by having the word "separate" there?
>>
>> I think it tries to convey a notion that 2 branches represent separate
>> lines of development. I.e., that the whole purpose of branching is to
>> provide support for independent, or parallel, or /separate/ lines of
>> development.
>
> So in the context of talking about a branch, there is no need to say
> "a separate line".  It only starts making sense to use the word
> "separate" whey you say "this is a line of development.  By the way,
> there is another line of development that is separate from the first
> one".
[...]
Show 7 quoted lines
> In the mental model of Git about branches, I think the only one
> thing people can agree on is that a branch points at a commit, and
> checking it out and making a commit on top of it will change that
> branch to point at the newly created commit.  And this view supports
> the word "separate"---whether you have two branches pointing at the
> same commit or a different one, building a new commit on and
> advancing the tip of one branch does not affect the other branch.

So, what do we finally do? Just remove "active", or replace it with "separate"?

It's fine with me either way. Will you just fix it yourself, or should I re-roll if "separate" is not accepted?

-- Sergey
Previous: Sergey OrganovNext: Junio C Hamano
Message 6 of 8 in “glossary: improve "branch" definition”
  1. glossary: improve "branch" definitionSergey Organov, Nov 23, 2020
  2. Junio C HamanoNov 23, 2020
  3. Sergey OrganovNov 23, 2020
  4. Junio C HamanoNov 23, 2020
  5. Sergey OrganovNov 24, 2020
  6. Sergey OrganovDec 2, 2020
  7. Junio C HamanoDec 2, 2020
  8. Sergey OrganovDec 3, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.