Sync with 2.4.9

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 4e617e6979dda86138e14cb93d84016d304de07a..82a4125a2da805e0b3c21e4e827bf203d5ac4532 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -22,7 +22,7 @@ presents the merge commit in a special format as produced by
 For tags, it shows the tag message and the referenced objects.
 
 For trees, it shows the names (equivalent to 'git ls-tree'
-with \--name-only).
+with --name-only).
 
 For plain blobs, it shows the plain contents.