diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-02 13:51:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-02 13:51:30 -0800 |
| commit | 601b1571e8e61e7dc1473a6d5049261a9524f381 (patch) | |
| tree | ae5d81d26e499b97c0c4b87b70ae7ea635d7884e /Documentation/glossary-content.txt | |
| parent | cce4778520b6ade4bc839fe054500253f7d22570 (diff) | |
| parent | d44b517137ab0d869c81bd532163c3e3e85481e6 (diff) | |
| download | git-601b1571e8e61e7dc1473a6d5049261a9524f381.tar.gz | |
Merge branch 'jc/orphan-unborn'
Doc updates to clarify what an "unborn branch" means.
* jc/orphan-unborn:
orphan/unborn: fix use of 'orphan' in end-user facing messages
orphan/unborn: add to the glossary and use them consistently
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index fbbb3f2de3..f7d98c11e3 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -314,6 +314,12 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_octopus]]octopus:: To <<def_merge,merge>> more than two <<def_branch,branches>>. +[[def_orphan]]orphan:: + The act of getting on a <<def_branch,branch>> that does not + exist yet (i.e., an <<def_unborn,unborn>> branch). After + such an operation, the commit first created becomes a commit + without a parent, starting a new history. + [[def_origin]]origin:: The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default @@ -697,6 +703,18 @@ The most notable example is `HEAD`. object, etc. +[[def_unborn]]unborn:: + The <<def_HEAD,HEAD>> can point at a <<def_branch,branch>> + that does not yet exist and that does not have any commit on + it yet, and such a branch is called an unborn branch. The + most typical way users encounter an unborn branch is by + creating a repository anew without cloning from elsewhere. + The HEAD would point at the 'main' (or 'master', depending + on your configuration) branch that is yet to be born. Also + some operations can get you on an unborn branch with their + <<def_orphan,orphan>> option. + + [[def_unmerged_index]]unmerged index:: An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>. |