Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: "git checkout -b/-B/--orphan" always takes a branch name
author
Junio C Hamano
<gitster@pobox.com>
Sun, 26 Aug 2012 18:40:08 +0000
(11:40 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 26 Aug 2012 18:40:08 +0000
(11:40 -0700)
While the synopsis section makes it clear that the new branch name
is the parameter to these flags, the option description did not.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-checkout.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d0f1ea6
)
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index c0a96e6c1eede3b511689f35e9130a26ea81e003..e3270cdbc561bce227ac7c25cc0bab9f56d6c1ef 100644
(file)
--- 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.
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.
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
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.
<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
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