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/config | |
| 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/config')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 2737381a11..4d7e5d8759 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -140,6 +140,6 @@ advice.*:: Advice shown when a fast-forward is not possible. worktreeAddOrphan:: Advice shown when a user tries to create a worktree from an - invalid reference, to instruct how to create a new orphan + invalid reference, to instruct how to create a new unborn branch instead. -- |