Remove [-b] options from help syntax lines
authorMatt Mackall <mpm@selenic.com>
Tue, 24 Oct 2006 17:22:07 -0500
changeset 3504 f4ab58d4ccd4
parent 3503 b28d3e0f9a8c
child 3505 1295ad66fac8
child 3508 0aef94f45ebf
Remove [-b] options from help syntax lines
mercurial/commands.py
--- a/mercurial/commands.py	Tue Oct 24 17:07:11 2006 -0500
+++ b/mercurial/commands.py	Tue Oct 24 17:22:07 2006 -0500
@@ -2998,7 +2998,7 @@
           ('', 'style', '', _('display using template map file')),
           ('r', 'rev', '', _('show only heads which are descendants of rev')),
           ('', 'template', '', _('display with template'))],
-         _('hg heads [-b] [-r <rev>]')),
+         _('hg heads [-r <rev>]')),
     "help": (help_, [], _('hg help [COMMAND]')),
     "identify|id": (identify, [], _('hg identify')),
     "import|patch":
@@ -3059,7 +3059,7 @@
         (merge,
          [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')),
           ('f', 'force', None, _('force a merge with outstanding changes'))],
-         _('hg merge [-b TAG] [-f] [REV]')),
+         _('hg merge [-f] [REV]')),
     "outgoing|out": (outgoing,
          [('M', 'no-merges', None, _('do not show merges')),
           ('f', 'force', None,
@@ -3077,7 +3077,7 @@
           ('r', 'rev', '', _('show parents from the specified rev')),
           ('', 'style', '', _('display using template map file')),
           ('', 'template', '', _('display with template'))],
-         _('hg parents [-b] [-r REV] [FILE]')),
+         _('hg parents [-r REV] [FILE]')),
     "paths": (paths, [], _('hg paths [NAME]')),
     "^pull":
         (pull,
@@ -3177,7 +3177,7 @@
           ('', 'style', '', _('display using template map file')),
           ('p', 'patch', None, _('show patch')),
           ('', 'template', '', _('display with template'))],
-         _('hg tip [-b] [-p]')),
+         _('hg tip [-p]')),
     "unbundle":
         (unbundle,
          [('u', 'update', None,
@@ -3191,7 +3191,7 @@
           ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
           ('C', 'clean', None, _('overwrite locally modified files')),
           ('f', 'force', None, _('force a merge with outstanding changes'))],
-         _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
+         _('hg update [-m] [-C] [-f] [REV]')),
     "verify": (verify, [], _('hg verify')),
     "version": (show_version, [], _('hg version')),
 }