Merge branch 'pb/prepare-commit-msg'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index c210b9af6bb4ce09d061e24715b07cd64887d54c..dccf0e20eccd20d45ac83828dbc7c67fa6a86e1a 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -20,11 +20,14 @@ 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 gitlink:git-ls-tree[1]
+For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
 with \--name-only).
 
 For plain blobs, it shows the plain contents.
 
+The command takes options applicable to the linkgit: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,11 @@ 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 linkgit:git-rev-parse[1].
+
+include::pretty-options.txt[]
+
 
 include::pretty-formats.txt[]
 
@@ -43,15 +51,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`.
 
@@ -75,5 +83,4 @@ This manual page is a stub. You can help the git documentation by expanding it.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite