Skip to content

Commit 1d022bb

Browse files
SyntevoAlexgitster
authored andcommitted
doc: checkout: remove duplicate synopsis
It was added in [1]. I understand that the duplicate change was not intentional and comes from an oversight. Also, in explanation, there was only one section for two synopsis entries. Fix both problems by removing duplicate synopsis. <paths> vs <pathspec> is resolved in next patch. [1] Commit b59698a ("checkout doc: clarify command line args for "checkout paths" mode" 2017-10-11) Signed-off-by: Alexandr Miloslavskiy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bebb5d6 commit 1d022bb

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Documentation/git-checkout.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ SYNOPSIS
1313
'git checkout' [-q] [-f] [-m] [--detach] <commit>
1414
'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
1515
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
16-
'git checkout' [<tree-ish>] [--] <pathspec>...
1716
'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...]
1817

1918
DESCRIPTION
@@ -79,7 +78,7 @@ be used to detach `HEAD` at the tip of the branch (`git checkout
7978
+
8079
Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
8180

82-
'git checkout' [<tree-ish>] [--] <pathspec>...::
81+
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...::
8382

8483
Overwrite paths in the working tree by replacing with the
8584
contents in the index or in the `<tree-ish>` (most often a

0 commit comments

Comments
 (0)