Junio,
as reported by Rainer.. Trivial patch attached if you want to use
that, or just do it yourself.
Linus
On Mon, Sep 27, 2010 at 11:37 AM, Rainer Standke
<rainer.standke@xxxxxxxxxxxx> wrote:
> Hello Mr. Torvalds,
>
> I am wondering if you might need to add 'does' to the following line in the manual:
> "When <paths> or --patch are given, git checkout not switch branches."
>
> It might then read:
> "When <paths> or --patch are given, git checkout does not switch branches."
>
> Respectfully,
>
> Rainer Standke
From 83967b95dd82fa0bdcc72a801c93e591d0560e2a Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon, 27 Sep 2010 12:14:57 -0700
Subject: [PATCH] Fix missing 'does' in man-page for 'git checkout'
Reported-by: Rainer Standke <rainer.standke@xxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/git-checkout.txt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index f88e997..22d3611 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
--
1.7.3