From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 9186D1FB0B for ; Thu, 3 Dec 2020 14:01:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387691AbgLCN7i (ORCPT ); Thu, 3 Dec 2020 08:59:38 -0500 Received: from mail.javad.com ([54.86.164.124]:55930 "EHLO mail.javad.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbgLCN7i (ORCPT ); Thu, 3 Dec 2020 08:59:38 -0500 X-Greylist: delayed 469 seconds by postgrey-1.27 at vger.kernel.org; Thu, 03 Dec 2020 08:59:37 EST Received: from osv (unknown [89.175.180.246]) by mail.javad.com (Postfix) with ESMTPSA id 2E5073E8F6; Thu, 3 Dec 2020 13:51:07 +0000 (UTC) Received: from osv by osv with local (Exim 4.92) (envelope-from ) id 1kkp0j-0003v2-Lm; Thu, 03 Dec 2020 16:51:05 +0300 From: Sergey Organov To: Junio C Hamano Cc: git@vger.kernel.org Subject: Re: [PATCH] glossary: improve "branch" definition References: <87blfnhm8w.fsf@osv.gnss.ru> <87im9vekzf.fsf@osv.gnss.ru> <877dq05swb.fsf@osv.gnss.ru> Date: Thu, 03 Dec 2020 16:51:05 +0300 In-Reply-To: (Junio C. Hamano's message of "Wed, 02 Dec 2020 14:55:56 -0800") Message-ID: <87ft4nhuba.fsf@osv.gnss.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Sergey Organov 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. Nice, thanks! -- Sergey > > Thanks for pinging a stalled thread. > > --- >8 ------ >8 ------ >8 ------ >8 ------ >8 ------ >8 ------ >8 --- > From: Sergey Organov > 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 > Signed-off-by: Junio C Hamano > --- > > 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 <>, 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 > <> on a branch is referred to as the tip of > that branch. The tip of the branch is referenced by a branch > <>, which moves forward as additional development