]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/orphan-unborn'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:30 +0000 (13:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:30 +0000 (13:51 -0800)
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

1  2 
Documentation/git-checkout.txt
Documentation/git-switch.txt
Documentation/glossary-content.txt
builtin/checkout.c
builtin/worktree.c
t/t2400-worktree-add.sh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b7b667270a389e709509f619a63726608a19182b,cbad2bd22b7c16bb004b4aae85345e9fa222d38e..3742971105c15268a3c8c41642ff98a75be4f1bf
@@@ -731,9 -709,9 +731,9 @@@ test_expect_success 'git worktree --no-
  test_dwim_orphan () {
        local info_text="No possible source branch, inferring '--orphan'" &&
        local fetch_error_text="fatal: No local or remote refs exist despite at least one remote" &&
-       local orphan_hint="hint: If you meant to create a worktree containing a new orphan branch" &&
+       local orphan_hint="hint: If you meant to create a worktree containing a new unborn branch" &&
        local invalid_ref_regex="^fatal: invalid reference: " &&
 -      local bad_combo_regex="^fatal: '[-a-z]*' and '[-a-z]*' cannot be used together" &&
 +      local bad_combo_regex="^fatal: options '[-a-z]*' and '[-a-z]*' cannot be used together" &&
  
        local git_ns="repo" &&
        local dashc_args="-C $git_ns" &&