@matheusbsbs / matheus-bagliano / commits / 442cb08fa0
Fork 0

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>

Linus Torvalds committed Sep 27, 2010 at 12:14 UTC 442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4
1 file changed +8 -8
Documentation/git-checkout.txt
+8 -8
@@ -45,14 +45,14 @@ successful.
45
46 'git checkout' [--patch] [<tree-ish>] [--] <pathspec>...::
47
48 - When <paths> or `--patch` are given, 'git checkout' *not* switch
49 - branches. It updates the named paths in the working tree from
50 - the index file or from a named <tree-ish> (most often a commit). In
51 - this case, the `-b` and `--track` options are meaningless and giving
52 - either of them results in an error. The <tree-ish> argument can be
53 - used to specify a specific tree-ish (i.e. commit, tag or tree)
54 - to update the index for the given paths before updating the
55 - working tree.
48 + When <paths> or `--patch` are given, 'git checkout' does *not*
49 + switch branches. It updates the named paths in the working tree
50 + from the index file or from a named <tree-ish> (most often a
51 + commit). In this case, the `-b` and `--track` options are
52 + meaningless and giving either of them results in an error. The
53 + <tree-ish> argument can be used to specify a specific tree-ish
54 + (i.e. commit, tag or tree) to update the index for the given
55 + paths before updating the working tree.
56 +
57 The index may contain unmerged entries because of a previous failed merge.
58 By default, if you try to check out such an entry from the index, the