From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] glossary: improve "branch" definition
Date: Wed, 02 Dec 2020 14:55:56 -0800 [thread overview]
Message-ID: <xmqq5z5jlsw3.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <877dq05swb.fsf@osv.gnss.ru> (Sergey Organov's message of "Wed, 02 Dec 2020 14:50:12 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> 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?
Let's see ... gitster goes and looks for what he suggested ...
So, I dunno. I'd say just settling on the simplest "is a line of
development" would be the easiest path for now.
I've queued the following.
Thanks for pinging a stalled thread.
--- >8 ------ >8 ------ >8 ------ >8 ------ >8 ------ >8 ------ >8 ---
From: Sergey Organov <sorganov@gmail.com>
Date: Mon, 23 Nov 2020 23:05:51 +0300
Subject: [PATCH] glossary: improve "branch" definition
The old phrasing is at least questionable, if not wrong, as there are
a lot of branches out there that didn't see active development for
years, yet they are still branches, ready to become active again any
time.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Notes (amlog):
Message-Id: <87blfnhm8w.fsf@osv.gnss.ru>
Documentation/glossary-content.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 090c888335..67c7a50b96 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -18,7 +18,7 @@
Untyped <<def_object,object>>, e.g. the contents of a file.
[[def_branch]]branch::
- A "branch" is an active line of development. The most recent
+ A "branch" is a line of development. The most recent
<<def_commit,commit>> on a branch is referred to as the tip of
that branch. The tip of the branch is referenced by a branch
<<def_head,head>>, which moves forward as additional development
--
2.29.2-577-g9ac7fd3f3f
next prev parent reply other threads:[~2020-12-02 23:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 20:05 [PATCH] glossary: improve "branch" definition Sergey Organov
2020-11-23 22:34 ` Junio C Hamano
2020-11-23 23:01 ` Sergey Organov
2020-11-23 23:26 ` Junio C Hamano
2020-11-24 22:02 ` Sergey Organov
2020-12-02 11:50 ` Sergey Organov
2020-12-02 22:55 ` Junio C Hamano [this message]
2020-12-03 13:51 ` Sergey Organov
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5z5jlsw3.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sorganov@gmail.com \
/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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).