Mercurial > hg

comparison hgext/rebase.py @ 25025:72f7f98bc5e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add short -k option for --keep histedit and strip already have a short option for keep, so this makes the interface more consistent
author Nat Mote <nmote@fb.com>
date Tue, 12 May 2015 15:04:19 -0700
parents c8a97fa742b7
children d1bd0fd07ee6
comparison
equal deleted inserted replaced
25024:263bbed1833c 25025:72f7f98bc5e5
65 ('m', 'message', '', 65 ('m', 'message', '',
66 _('use text as collapse commit message'), _('TEXT')), 66 _('use text as collapse commit message'), _('TEXT')),
67 ('e', 'edit', False, _('invoke editor on commit messages')), 67 ('e', 'edit', False, _('invoke editor on commit messages')),
68 ('l', 'logfile', '', 68 ('l', 'logfile', '',
69 _('read collapse commit message from file'), _('FILE')), 69 _('read collapse commit message from file'), _('FILE')),
70 ('', 'keep', False, _('keep original changesets')), 70 ('k', 'keep', False, _('keep original changesets')),
71 ('', 'keepbranches', False, _('keep original branch names')), 71 ('', 'keepbranches', False, _('keep original branch names')),
72 ('D', 'detach', False, _('(DEPRECATED)')), 72 ('D', 'detach', False, _('(DEPRECATED)')),
73 ('i', 'interactive', False, _('(DEPRECATED)')), 73 ('i', 'interactive', False, _('(DEPRECATED)')),
74 ('t', 'tool', '', _('specify merge tool')), 74 ('t', 'tool', '', _('specify merge tool')),
75 ('c', 'continue', False, _('continue an interrupted rebase')), 75 ('c', 'continue', False, _('continue an interrupted rebase')),