From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Dec 2020 18:21:36 +0000 (-0800)
Subject: Merge branch 'so/glossary-branch-is-not-necessarily-active'
X-Git-Tag: v2.30.0-rc0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9f1f4412cdb7fdb5da47fd1c5bc9614cc9aa48c;p=thirdparty%2Fgit.git

Merge branch 'so/glossary-branch-is-not-necessarily-active'

The glossary described a branch as an "active" line of development,
which is misleading---a stale and non-moving branch is still a
branch.

* so/glossary-branch-is-not-necessarily-active:
  glossary: improve "branch" definition
---

c9f1f4412cdb7fdb5da47fd1c5bc9614cc9aa48c