aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 13:59:58 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-12 13:59:58 -0700
commit1b8bc86b5eb86609c31cae48eb7569b24acacc90 (patch)
tree848df16fc9edb978ab9cf8905ab5b5f1d04d9262
parent7d9483c299b4467fb4c6d32ade8207232235528c (diff)
parent45aaf0310f2b85d9c3264d1703c82cd5085aaf24 (diff)
downloadgit-1b8bc86b5eb86609c31cae48eb7569b24acacc90.tar.gz
git-1b8bc86b5eb86609c31cae48eb7569b24acacc90.tar.xz
Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.7.11
The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. * jc/maint-doc-checkout-b-always-takes-branch-name: doc: "git checkout -b/-B/--orphan" always takes a branch name
-rw-r--r--Documentation/git-checkout.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 63a251612..11cc7f058 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -84,11 +84,11 @@ entries; instead, unmerged entries are ignored.
When checking out paths from the index, check out stage #2
('ours') or #3 ('theirs') for unmerged paths.
--b::
+-b <new_branch>::
Create a new branch named <new_branch> and start it at
<start_point>; see linkgit:git-branch[1] for details.
--B::
+-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
@@ -124,7 +124,7 @@ explicitly give a name with '-b' in such a case.
<commit> is not a branch name. See the "DETACHED HEAD" section
below for details.
---orphan::
+--orphan <new_branch>::
Create a new 'orphan' branch, named <new_branch>, started from
<start_point> and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new