Mercurial > hg

changeset 1436:db6d7b4005ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add --only-merges (-m) log
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 24 Oct 2005 15:37:45 -0700
parents 22b44fd9a166
children ea51d296085f
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 24 15:37:20 2005 -0700
+++ b/mercurial/commands.py	Mon Oct 24 15:37:45 2005 -0700
@@ -1281,6 +1281,8 @@
                        if p != nullid]
             if opts['no_merges'] and len(parents) == 2:
                  continue
+            if opts['only_merges'] and len(parents) != 2:
+                 continue
 
             br = None
             if opts['keyword']:
@@ -1903,6 +1905,7 @@
           ('k', 'keyword', [], _('search for a keyword')),
           ('r', 'rev', [], _('revision')),
           ('M', 'no-merges', None, _("do not show merges")),
+          ('m', 'only-merges', None, _("show only merges")),
           ('p', 'patch', None, _('show patch'))],
          _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
     "manifest": (manifest, [], _('hg manifest [REV]')),