Merge 1.5.1.5 in

[git.git] / Documentation / git-show.txt

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 5a219ab5776c719190095ab4e9af95514a888ea3..34c5caf2d08324cc1595013cbdcd40d89d7a1968 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[]