Merge branch 'maint-2.5' into maint-2.6

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index ee51c1adea51eadc29a68f0f395fabc3a79cd008..efe56e08085c70341149c546ab0848674a5bc33f 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is
 also fetched; the effect is to fetch tags that
 point at branches that you are interested in.  This default behavior
 can be changed by using the --tags or --no-tags options or by
-configuring remote.<name>.tagopt.  By using a refspec that fetches tags
+configuring remote.<name>.tagOpt.  By using a refspec that fetches tags
 explicitly, you can fetch tags that do not point into branches you
 are interested in as well.