Merge branch 'jk/merge-one-file-working-tree' into maint

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 67d221467d6dba14286f96e9ce1442cbfc1ee995..60ac8d26eb3203abd29adc4c0a007f80bb616caa 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -34,7 +34,7 @@ pointed by remote tags that it does not yet have, then fetch
 those missing tags.  If the other end has tags that point at
 branches you are not interested in, you will not get them.
 
-'git fetch' can fetch from either a single named repository, or
+'git fetch' can fetch from either a single named repository,
 or from several repositories at once if <group> is given and
 there is a remotes.<group> entry in the configuration file.
 (See linkgit:git-config[1]).