aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-27 12:14:57 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-27 15:08:06 -0700
commit442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4 (patch)
tree3327d8dd552e90721d6a786ed95642f37a0d7231 /Documentation/git-checkout.txt
parent9d14017adafc4829efc9e1393653579ad1d8ed71 (diff)
downloadgit-442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4.tar.gz
git-442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4.tar.xz
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>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt16
1 files changed, 8 insertions, 8 deletions
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] [<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