Merge branch 'jc/doc-checkout-b'

Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
different in the documentation.

* jc/doc-checkout-b:
  checkout: document -b/-B to highlight the differences from "git branch"
This commit is contained in:
Junio C Hamano 2023-01-30 14:24:21 -08:00
Родитель 5cc9858f1b fedb8ea2df
Коммит 06f2b5fb70
1 изменённых файлов: 8 добавлений и 6 удалений

Просмотреть файл

@ -146,14 +146,16 @@ on your side branch as `theirs` (i.e. "one contributor's work on top
of it").
-b <new-branch>::
Create a new branch named `<new-branch>` and start it at
`<start-point>`; see linkgit:git-branch[1] for details.
Create a new branch named `<new-branch>`, start it at
`<start-point>`, and check the resulting branch out;
see linkgit:git-branch[1] for details.
-B <new-branch>::
Creates the branch `<new-branch>` and start it at `<start-point>`;
if it already exists, then reset it to `<start-point>`. This is
equivalent to running "git branch" with "-f"; see
linkgit:git-branch[1] for details.
Creates the branch `<new-branch>`, start it at `<start-point>`;
if it already exists, then reset it to `<start-point>`. And then
check the resulting branch out. This is equivalent to running
"git branch" with "-f" followed by "git checkout" of that branch;
see linkgit:git-branch[1] for details.
-t::
--track[=(direct|inherit)]::