##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: change rebase help to talk about changesets and branch names
timeless@mozdev.org -
r9589:fdf0c375 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -460,9 +460,9 b' cmdtable = {'
460 ('s', 'source', '', _('rebase from a given revision')),
460 ('s', 'source', '', _('rebase from a given revision')),
461 ('b', 'base', '', _('rebase from the base of a given revision')),
461 ('b', 'base', '', _('rebase from the base of a given revision')),
462 ('d', 'dest', '', _('rebase onto a given revision')),
462 ('d', 'dest', '', _('rebase onto a given revision')),
463 ('', 'collapse', False, _('collapse the rebased revisions')),
463 ('', 'collapse', False, _('collapse the rebased changesets')),
464 ('', 'keep', False, _('keep original revisions')),
464 ('', 'keep', False, _('keep original changesets')),
465 ('', 'keepbranches', False, _('keep original branches')),
465 ('', 'keepbranches', False, _('keep original branch names')),
466 ('c', 'continue', False, _('continue an interrupted rebase')),
466 ('c', 'continue', False, _('continue an interrupted rebase')),
467 ('a', 'abort', False, _('abort an interrupted rebase')),] +
467 ('a', 'abort', False, _('abort an interrupted rebase')),] +
468 templateopts,
468 templateopts,
Show file before | Show file after | Hide comments
@@ -18,9 +18,9 b' options:'
18 -s --source rebase from a given revision
18 -s --source rebase from a given revision
19 -b --base rebase from the base of a given revision
19 -b --base rebase from the base of a given revision
20 -d --dest rebase onto a given revision
20 -d --dest rebase onto a given revision
21 --collapse collapse the rebased revisions
21 --collapse collapse the rebased changesets
22 --keep keep original revisions
22 --keep keep original changesets
23 --keepbranches keep original branches
23 --keepbranches keep original branch names
24 -c --continue continue an interrupted rebase
24 -c --continue continue an interrupted rebase
25 -a --abort abort an interrupted rebase
25 -a --abort abort an interrupted rebase
26 --style display using template map file
26 --style display using template map file
@@ -46,9 +46,9 b' options:'
46 -s --source rebase from a given revision
46 -s --source rebase from a given revision
47 -b --base rebase from the base of a given revision
47 -b --base rebase from the base of a given revision
48 -d --dest rebase onto a given revision
48 -d --dest rebase onto a given revision
49 --collapse collapse the rebased revisions
49 --collapse collapse the rebased changesets
50 --keep keep original revisions
50 --keep keep original changesets
51 --keepbranches keep original branches
51 --keepbranches keep original branch names
52 -c --continue continue an interrupted rebase
52 -c --continue continue an interrupted rebase
53 -a --abort abort an interrupted rebase
53 -a --abort abort an interrupted rebase
54 --style display using template map file
54 --style display using template map file
@@ -74,9 +74,9 b' options:'
74 -s --source rebase from a given revision
74 -s --source rebase from a given revision
75 -b --base rebase from the base of a given revision
75 -b --base rebase from the base of a given revision
76 -d --dest rebase onto a given revision
76 -d --dest rebase onto a given revision
77 --collapse collapse the rebased revisions
77 --collapse collapse the rebased changesets
78 --keep keep original revisions
78 --keep keep original changesets
79 --keepbranches keep original branches
79 --keepbranches keep original branch names
80 -c --continue continue an interrupted rebase
80 -c --continue continue an interrupted rebase
81 -a --abort abort an interrupted rebase
81 -a --abort abort an interrupted rebase
82 --style display using template map file
82 --style display using template map file
@@ -102,9 +102,9 b' options:'
102 -s --source rebase from a given revision
102 -s --source rebase from a given revision
103 -b --base rebase from the base of a given revision
103 -b --base rebase from the base of a given revision
104 -d --dest rebase onto a given revision
104 -d --dest rebase onto a given revision
105 --collapse collapse the rebased revisions
105 --collapse collapse the rebased changesets
106 --keep keep original revisions
106 --keep keep original changesets
107 --keepbranches keep original branches
107 --keepbranches keep original branch names
108 -c --continue continue an interrupted rebase
108 -c --continue continue an interrupted rebase
109 -a --abort abort an interrupted rebase
109 -a --abort abort an interrupted rebase
110 --style display using template map file
110 --style display using template map file
General Comments 0
You need to be logged in to leave comments. Login now