From: SZEDER Gábor <szeder@ira.uka.de>
Date: Mon, 13 Jul 2009 15:11:44 +0000 (+0200)
Subject: Document 'git (rev-list|log) --merges'
X-Git-Tag: v1.6.4-rc1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2657420d9ecee5c68f300cdabdf2bec7e76a2d05;p=git.git

Document 'git (rev-list|log) --merges'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 1c9cc2889..a765cfa4d 100644
--- 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 ]
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 11eec941d..bf66116d6 100644
--- 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.