mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'jc/doc-checkout-b' into maint-2.39
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:
commit
e34fd1334c
|
@ -146,14 +146,16 @@ on your side branch as `theirs` (i.e. "one contributor's work on top
|
||||||
of it").
|
of it").
|
||||||
|
|
||||||
-b <new-branch>::
|
-b <new-branch>::
|
||||||
Create a new branch named `<new-branch>` and start it at
|
Create a new branch named `<new-branch>`, start it at
|
||||||
`<start-point>`; see linkgit:git-branch[1] for details.
|
`<start-point>`, and check the resulting branch out;
|
||||||
|
see linkgit:git-branch[1] for details.
|
||||||
|
|
||||||
-B <new-branch>::
|
-B <new-branch>::
|
||||||
Creates the branch `<new-branch>` and start it at `<start-point>`;
|
Creates the branch `<new-branch>`, start it at `<start-point>`;
|
||||||
if it already exists, then reset it to `<start-point>`. This is
|
if it already exists, then reset it to `<start-point>`. And then
|
||||||
equivalent to running "git branch" with "-f"; see
|
check the resulting branch out. This is equivalent to running
|
||||||
linkgit:git-branch[1] for details.
|
"git branch" with "-f" followed by "git checkout" of that branch;
|
||||||
|
see linkgit:git-branch[1] for details.
|
||||||
|
|
||||||
-t::
|
-t::
|
||||||
--track[=(direct|inherit)]::
|
--track[=(direct|inherit)]::
|
||||||
|
|
Loading…
Reference in a new issue