Merge branch 'jc/maint-1.6.4-show-branch-default' into maint

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index ae1186e3402eb9c428001d32071dc3998b04bb3c..974d9f527f2efb78c435689d7f8bf2bdc807e88d 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -14,6 +14,7 @@ SYNOPSIS
             [ \--max-age=timestamp ]
             [ \--min-age=timestamp ]
             [ \--sparse ]
+            [ \--merges ]
             [ \--no-merges ]
             [ \--first-parent ]
             [ \--remove-empty ]