mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Fix missing 'does' in man-page for 'git checkout'
Reported-by: Rainer Standke <rainer.standke@krankikom.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9d14017ada
commit
442cb08fa0
|
@ -45,14 +45,14 @@ successful.
|
|||
|
||||
'git checkout' [--patch] [<tree-ish>] [--] <pathspec>...::
|
||||
|
||||
When <paths> 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 <tree-ish> (most often a commit). In
|
||||
this case, the `-b` and `--track` options are meaningless and giving
|
||||
either of them results in an error. The <tree-ish> 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 <paths> 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 <tree-ish> (most often a
|
||||
commit). In this case, the `-b` and `--track` options are
|
||||
meaningless and giving either of them results in an error. The
|
||||
<tree-ish> 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
|
||||
|
|
Loading…
Reference in a new issue