diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-24 12:09:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-24 12:11:23 +0900 |
| commit | 49dc156376e33ae62f84141f4425b2bf2978ad68 (patch) | |
| tree | 76bb895c103c5f05e7f86afdc8eb6e4d435ca647 /Documentation/git-switch.txt | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-49dc156376e33ae62f84141f4425b2bf2978ad68.tar.gz | |
orphan/unborn: add to the glossary and use them consistently
To orphan is a verb that denotes the act of getting on an unborn
branch, and a few references to "orphan branch" in our documentation
are misuses of the word. They caused end-user confusion, which was
made even worse because we did not have the term defined in the
glossary document. Add entries for "unborn" branch and "orphan"
operation to the glossary, and adjust existing documentation
accordingly.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-switch.txt')
| -rw-r--r-- | Documentation/git-switch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt index c60fc9c138..3e23a82cf2 100644 --- a/Documentation/git-switch.txt +++ b/Documentation/git-switch.txt @@ -171,7 +171,7 @@ name, the guessing is aborted. You can explicitly give a name with `branch.autoSetupMerge` configuration variable is true. --orphan <new-branch>:: - Create a new 'orphan' branch, named `<new-branch>`. All + Create a new unborn branch, named `<new-branch>`. All tracked files are removed. --ignore-other-worktrees:: |