Merge branch 'lt/block-sha1'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 11eec941dff7302ffcd68eca3d6437d31c022ca9..bf66116d61af4f16cff59ed1563f38736a14ecce 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -201,6 +201,10 @@ endif::git-rev-list[]
 
        Stop when a given path disappears from the tree.
 
+--merges::
+
+       Print only merge commits.
+
 --no-merges::
 
        Do not print commits with more than one parent.