doc: checkout: fix broken text reference

[thirdparty/git.git] / Documentation / git-checkout.txt

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index cf3cac0a2b518ec902453d7e65b6b7d403a99ef7..d47046e05034d6e02241b777b2ddd6d985e3fda7 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -13,7 +13,6 @@ SYNOPSIS
 'git checkout' [-q] [-f] [-m] [--detach] <commit>
 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
-'git checkout' [<tree-ish>] [--] <pathspec>...
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...]
 
 DESCRIPTION
@@ -79,7 +78,7 @@ be used to detach `HEAD` at the tip of the branch (`git checkout
 +
 Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
 
-'git checkout' [<tree-ish>] [--] <pathspec>...::
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...::
 
        Overwrite paths in the working tree by replacing with the
        contents in the index or in the `<tree-ish>` (most often a
@@ -96,12 +95,10 @@ using `--ours` or `--theirs`.  With `-m`, changes made to the working tree
 file can be discarded to re-create the original conflicted merge result.
 
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]::
-       This is similar to the "check out paths to the working tree
-       from either the index or from a tree-ish" mode described
-       above, but lets you use the interactive interface to show
-       the "diff" output and choose which hunks to use in the
-       result.  See below for the description of `--patch` option.
-
+       This is similar to the previous mode, but lets you use the
+       interactive interface to show the "diff" output and choose which
+       hunks to use in the result.  See below for the description of
+       `--patch` option.
 
 OPTIONS
 -------