Mercurial > hg

comparison hgext/rebase.py @ 9599:f3404b7f37ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 16 Oct 2009 00:45:18 +0200
parents 341182ac95e4 fdf0c375cdbf
children 49efeed49c94
comparison
equal deleted inserted replaced
9598:a981ddb16b80 9599:f3404b7f37ca
462 (rebase, 462 (rebase,
463 [ 463 [
464 ('s', 'source', '', _('rebase from a given revision')), 464 ('s', 'source', '', _('rebase from a given revision')),
465 ('b', 'base', '', _('rebase from the base of a given revision')), 465 ('b', 'base', '', _('rebase from the base of a given revision')),
466 ('d', 'dest', '', _('rebase onto a given revision')), 466 ('d', 'dest', '', _('rebase onto a given revision')),
467 ('', 'collapse', False, _('collapse the rebased revisions')), 467 ('', 'collapse', False, _('collapse the rebased changesets')),
468 ('', 'keep', False, _('keep original revisions')), 468 ('', 'keep', False, _('keep original changesets')),
469 ('', 'keepbranches', False, _('keep original branches')), 469 ('', 'keepbranches', False, _('keep original branch names')),
470 ('c', 'continue', False, _('continue an interrupted rebase')), 470 ('c', 'continue', False, _('continue an interrupted rebase')),
471 ('a', 'abort', False, _('abort an interrupted rebase')),] + 471 ('a', 'abort', False, _('abort an interrupted rebase')),] +
472 templateopts, 472 templateopts,
473 _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] ' 473 _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] '
474 '[--keepbranches] | [-c] | [-a]')), 474 '[--keepbranches] | [-c] | [-a]')),