diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:52 -0800 |
| commit | e34fd1334c7ecaddbb83aca5175414a793782282 (patch) | |
| tree | 2442cf5068c37378ec21ec0b5a6204e7d892398f | |
| parent | 26fc32604455486503e1a6dcde835eaf2b6d7999 (diff) | |
| parent | fedb8ea2df0325950285529b6e9e3f65cb227c67 (diff) | |
| download | git-e34fd1334c7ecaddbb83aca5175414a793782282.tar.gz | |
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"
| -rw-r--r-- | Documentation/git-checkout.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 4cb9d555b4..dcff44196d 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -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)]:: |