X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-checkout.txt;h=22d36114df68963811a80a6c311a98b1a26d88d3;hb=b3f01ff29f7131e959bcfdfd004744d74d5fa319;hp=f88e9977d1137da0449736f5f8fe6746b42437e1;hpb=460645a8c331196c3e5e61de4acf3f9c5803e335;p=git.git diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index f88e9977d..22d36114d 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -45,14 +45,14 @@ successful. 'git checkout' [--patch] [] [--] ...:: - When or `--patch` are given, 'git checkout' *not* switch - branches. It updates the named paths in the working tree from - the index file or from a named (most often a commit). In - this case, the `-b` and `--track` options are meaningless and giving - either of them results in an error. The argument can be - used to specify a specific tree-ish (i.e. commit, tag or tree) - to update the index for the given paths before updating the - working tree. + When or `--patch` are given, 'git checkout' does *not* + switch branches. It updates the named paths in the working tree + from the index file or from a named (most often a + commit). In this case, the `-b` and `--track` options are + meaningless and giving either of them results in an error. The + argument can be used to specify a specific tree-ish + (i.e. commit, tag or tree) to update the index for the given + paths before updating the working tree. + The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the