Merge branch 'maint'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index c210b9af6bb4ce09d061e24715b07cd64887d54c..5a219ab5776c719190095ab4e9af95514a888ea3 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -25,6 +25,9 @@ with \--name-only).
 
 For plain blobs, it shows the plain contents.
 
+The command takes options applicable to the gitlink:git-diff-tree[1] command to
+control how the changes the commit introduces are shown.
+
 This manual page describes only the most frequently used options.
 
 
@@ -32,6 +35,8 @@ OPTIONS
 -------
 <object>::
        The name of the object to show.
+       For a more complete list of ways to spell object names, see
+       "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
 
 include::pretty-formats.txt[]
 
@@ -43,15 +48,15 @@ git show v1.0.0::
        Shows the tag `v1.0.0`, along with the object the tags
        points at.
 
-git show v1.0.0^{tree}::
+git show v1.0.0^\{tree\}::
        Shows the tree pointed to by the tag `v1.0.0`.
 
-git show next~10:Documentation/README
+git show next~10:Documentation/README::
        Shows the contents of the file `Documentation/README` as
        they were current in the 10th last commit of the branch
        `next`.
 
-git show master:Makefile master:t/Makefile
+git show master:Makefile master:t/Makefile::
        Concatenates the contents of said Makefiles in the head
        of the branch `master`.