Merge branch 'js/etc-config'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index c210b9af6bb4ce09d061e24715b07cd64887d54c..f56f16498398405a170c29543efc44a08e388c49 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[]