Mercurial > hg-stable
comparison hgext/rebase.py @ 17325:e4db509c08ec stable
rebase: remove second broken synopsis line (issue3172)
Displaying multiple synopsis in online help has been broken since Matt
RST refactoring, around ff26712a0c50. Rebase help is apparently the only
one using this trick, just drop the second synopsis and assume people
will understand as with graft help.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Tue, 31 Jul 2012 18:18:26 +0200 |
parents | fba17a64fa49 |
children | 910123eac887 |
comparison
equal
deleted
inserted
replaced
17324:9f94358f9f93 | 17325:e4db509c08ec |
---|---|
51 ('D', 'detach', False, _('(DEPRECATED)')), | 51 ('D', 'detach', False, _('(DEPRECATED)')), |
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, |
56 _('hg rebase [-s REV | -b REV] [-d REV] [options]\n' | 56 _('[-s REV | -b REV] [-d REV] [OPTION]')) |
57 'hg rebase {-a|-c}')) | |
58 def rebase(ui, repo, **opts): | 57 def rebase(ui, repo, **opts): |
59 """move changeset (and descendants) to a different branch | 58 """move changeset (and descendants) to a different branch |
60 | 59 |
61 Rebase uses repeated merging to graft changesets from one part of | 60 Rebase uses repeated merging to graft changesets from one part of |
62 history (the source) onto another (the destination). This can be | 61 history (the source) onto another (the destination). This can be |