Merge branch 'jc/git-log-doc'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 5a219ab5776c719190095ab4e9af95514a888ea3..a42e1211500a6a6ecdf1d9e1ddbf6712869ceb79 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -38,6 +38,9 @@ OPTIONS
        For a more complete list of ways to spell object names, see
        "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
 
+include::pretty-options.txt[]
+
+
 include::pretty-formats.txt[]
 
 
@@ -81,4 +84,3 @@ This manual page is a stub. You can help the git documentation by expanding it.
 GIT
 ---
 Part of the gitlink:git[7] suite
-