diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -460,9 +460,9 @@ cmdtable = { ('s', 'source', '', _('rebase from a given revision')), ('b', 'base', '', _('rebase from the base of a given revision')), ('d', 'dest', '', _('rebase onto a given revision')), - ('', 'collapse', False, _('collapse the rebased revisions')), - ('', 'keep', False, _('keep original revisions')), - ('', 'keepbranches', False, _('keep original branches')), + ('', 'collapse', False, _('collapse the rebased changesets')), + ('', 'keep', False, _('keep original changesets')), + ('', 'keepbranches', False, _('keep original branch names')), ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase')),] + templateopts, diff --git a/tests/test-rebase-parameters.out b/tests/test-rebase-parameters.out --- a/tests/test-rebase-parameters.out +++ b/tests/test-rebase-parameters.out @@ -18,9 +18,9 @@ options: -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - --keep keep original revisions - --keepbranches keep original branches + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -46,9 +46,9 @@ options: -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - --keep keep original revisions - --keepbranches keep original branches + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -74,9 +74,9 @@ options: -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - --keep keep original revisions - --keepbranches keep original branches + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -102,9 +102,9 @@ options: -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - --keep keep original revisions - --keepbranches keep original branches + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file