diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2009-07-13 17:11:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-13 11:09:41 -0700 |
| commit | 2657420d9ecee5c68f300cdabdf2bec7e76a2d05 (patch) | |
| tree | dd020f02ba8308e9d3915890d502d22a1835e6f6 | |
| parent | 69fb8283937a18a031aeef12ea2a530c8ccf3e83 (diff) | |
| download | git-2657420d9ecee5c68f300cdabdf2bec7e76a2d05.tar.gz git-2657420d9ecee5c68f300cdabdf2bec7e76a2d05.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-rev-list.txt | 1 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 4 |
2 files changed, 5 insertions, 0 deletions
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. |