hgext/rebase.py
changeset 11321 40c06bbf58be
parent 11316 7fa3968004c1
child 11531 59bd20451ab6
equal deleted inserted replaced
11320:e4274f9f97c8 11321:40c06bbf58be
   536 
   536 
   537 cmdtable = {
   537 cmdtable = {
   538 "rebase":
   538 "rebase":
   539         (rebase,
   539         (rebase,
   540         [
   540         [
   541         ('s', 'source', '', _('rebase from the specified changeset')),
   541         ('s', 'source', '',
   542         ('b', 'base', '', _('rebase from the base of the specified changeset '
   542          _('rebase from the specified changeset'), _('REV')),
   543                             '(up to greatest common ancestor of base and dest)')),
   543         ('b', 'base', '',
   544         ('d', 'dest', '', _('rebase onto the specified changeset')),
   544          _('rebase from the base of the specified changeset '
       
   545            '(up to greatest common ancestor of base and dest)'),
       
   546          _('REV')),
       
   547         ('d', 'dest', '',
       
   548          _('rebase onto the specified changeset'), _('REV')),
   545         ('', 'collapse', False, _('collapse the rebased changesets')),
   549         ('', 'collapse', False, _('collapse the rebased changesets')),
   546         ('', 'keep', False, _('keep original changesets')),
   550         ('', 'keep', False, _('keep original changesets')),
   547         ('', 'keepbranches', False, _('keep original branch names')),
   551         ('', 'keepbranches', False, _('keep original branch names')),
   548         ('', 'detach', False, _('force detaching of source from its original '
   552         ('', 'detach', False, _('force detaching of source from its original '
   549                                 'branch')),
   553                                 'branch')),