Merge branch 'maint'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 2b4df3f96f76dd023721ab03a149afd6ed8c5dd8..4c880a871792a64355ac94537af934aca14879ec 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -26,10 +26,7 @@ OPTIONS
 <commitid>::
        ID of the commit to show.
 
---pretty=<format>::
-       Controls the output format for the commit logs.
-       <format> can be one of 'raw', 'medium', 'short', 'full',
-       and 'oneline'.
+include::pretty-formats.txt[]
 
 Author
 ------