hgext/rebase.py
changeset 9589 fdf0c375cdbf
parent 9183 d0225fa2f6c4
child 9599 f3404b7f37ca
equal deleted inserted replaced
9588:a9d1e7c8160e 9589:fdf0c375cdbf
   458         (rebase,
   458         (rebase,
   459         [
   459         [
   460         ('s', 'source', '', _('rebase from a given revision')),
   460         ('s', 'source', '', _('rebase from a given revision')),
   461         ('b', 'base', '', _('rebase from the base of a given revision')),
   461         ('b', 'base', '', _('rebase from the base of a given revision')),
   462         ('d', 'dest', '', _('rebase onto a given revision')),
   462         ('d', 'dest', '', _('rebase onto a given revision')),
   463         ('', 'collapse', False, _('collapse the rebased revisions')),
   463         ('', 'collapse', False, _('collapse the rebased changesets')),
   464         ('', 'keep', False, _('keep original revisions')),
   464         ('', 'keep', False, _('keep original changesets')),
   465         ('', 'keepbranches', False, _('keep original branches')),
   465         ('', 'keepbranches', False, _('keep original branch names')),
   466         ('c', 'continue', False, _('continue an interrupted rebase')),
   466         ('c', 'continue', False, _('continue an interrupted rebase')),
   467         ('a', 'abort', False, _('abort an interrupted rebase')),] +
   467         ('a', 'abort', False, _('abort an interrupted rebase')),] +
   468          templateopts,
   468          templateopts,
   469         _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] '
   469         _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] '
   470                             '[--keepbranches] | [-c] | [-a]')),
   470                             '[--keepbranches] | [-c] | [-a]')),