Merge branch 'master' into js/merge

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 00a95e249fe82f2eb3d53dcc541559dceb3e8709..ec43c0b3a8ca87c2bd0116e1a20061eda3ca3f21 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -79,11 +79,7 @@ Using these options, gitlink:git-rev-list[1] will act similar to the
 more specialized family of commit log tools: gitlink:git-log[1],
 gitlink:git-show[1], and gitlink:git-whatchanged[1]
 
---pretty[='<format>']::
-
-       Pretty print the contents of the commit logs in a given format,
-       where '<format>' can be one of 'raw', 'medium', 'short', 'full',
-       and 'oneline'. When left out the format default to 'medium'.
+include::pretty-formats.txt[]
 
 --relative-date::