comparison hgext/rebase.py @ 15737:8edd9f2c7b57

rebase: add a "D" short option for detach Detach is usually what I want when I use --source or (in particular) --rev. Having a shorter option make it less an hassle to use it.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 27 Dec 2011 21:12:09 +0100
parents 306e84e8bbe9
children 65df60a3f96b
comparison
equal deleted inserted replaced
15736:306e84e8bbe9 15737:8edd9f2c7b57
45 ('e', 'edit', False, _('invoke editor on commit messages')), 45 ('e', 'edit', False, _('invoke editor on commit messages')),
46 ('l', 'logfile', '', 46 ('l', 'logfile', '',
47 _('read collapse commit message from file'), _('FILE')), 47 _('read collapse commit message from file'), _('FILE')),
48 ('', 'keep', False, _('keep original changesets')), 48 ('', 'keep', False, _('keep original changesets')),
49 ('', 'keepbranches', False, _('keep original branch names')), 49 ('', 'keepbranches', False, _('keep original branch names')),
50 ('', 'detach', False, _('force detaching of source from its original ' 50 ('D', 'detach', False, _('force detaching of source from its original '
51 'branch')), 51 'branch')),
52 ('t', 'tool', '', _('specify merge tool')), 52 ('t', 'tool', '', _('specify merge tool')),
53 ('c', 'continue', False, _('continue an interrupted rebase')), 53 ('c', 'continue', False, _('continue an interrupted rebase')),
54 ('a', 'abort', False, _('abort an interrupted rebase'))] + 54 ('a', 'abort', False, _('abort an interrupted rebase'))] +
55 templateopts, 55 templateopts,