# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 2006-02-20 19:09:25
# Node ID 47f4fbee32c55a6e8b9febd5a4a3ba69c131f3fd
# Parent  23012d48ae91786cfaf258c9f10ab72bd324bbed

add options to log man page.


diff --git a/doc/hg.1.txt b/doc/hg.1.txt
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -376,7 +376,11 @@ log [-r revision ...] [-p] [files]::
     options:
     -I, --include <pat>   include names matching the given patterns
     -X, --exclude <pat>   exclude names matching the given patterns
+    -b, --branch          show branches
+    -k, --keyword <str>   search for keywords
     -l, --limit <num>     print no more than this many changes
+    -M, --no-merges       do not show merges
+    -m, --only-merges     only show merges
     -r, --rev <A>         show the specified revision or range
     -p, --patch           show patch