1948 entry[1].append(('', 'rebase', None, |
1948 entry[1].append(('', 'rebase', None, |
1949 _("rebase working directory to branch head"))) |
1949 _("rebase working directory to branch head"))) |
1950 entry[1].append(('t', 'tool', '', |
1950 entry[1].append(('t', 'tool', '', |
1951 _("specify merge tool for rebase"))) |
1951 _("specify merge tool for rebase"))) |
1952 cmdutil.summaryhooks.add('rebase', summaryhook) |
1952 cmdutil.summaryhooks.add('rebase', summaryhook) |
1953 statemod.unfinishedstates.append( |
1953 statemod.addunfinished('rebase', fname='rebasestate') |
1954 ['rebasestate', False, False, _('rebase in progress'), |
|
1955 _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
|
1956 cmdutil.afterresolvedstates.append( |
1954 cmdutil.afterresolvedstates.append( |
1957 ['rebasestate', _('hg rebase --continue')]) |
1955 ['rebasestate', _('hg rebase --continue')]) |