Merge branch 'so/glossary-branch-is-not-necessarily-active'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2020 18:21:36 +0000 (10:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2020 18:21:37 +0000 (10:21 -0800)
commitc9f1f4412cdb7fdb5da47fd1c5bc9614cc9aa48c
tree10d8b0ade1ce216186f756b242efc5c8f56a4901
parentc59b73bef302f4efd0f853f913328aab534b1f1a
parenteef1ceabd8200d1160b015b049a896612a74f0e8
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