diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-14 10:21:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 10:21:37 -0800 |
| commit | c9f1f4412cdb7fdb5da47fd1c5bc9614cc9aa48c (patch) | |
| tree | 10d8b0ade1ce216186f756b242efc5c8f56a4901 | |
| parent | Merge branch 'fc/atmark-in-refspec' (diff) | |
| parent | glossary: improve "branch" definition (diff) | |
| download | tgif-c9f1f4412cdb7fdb5da47fd1c5bc9614cc9aa48c.tar.xz | |
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
| -rw-r--r-- | Documentation/glossary-content.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |