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

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

rebase: correct help text...
Stefano Tortarolo -
r7951:4d9e8efb default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -427,15 +427,15 b' cmdtable = {'
427 427 "rebase":
428 428 (rebase,
429 429 [
430 ('', 'keep', False, _('keep original revisions')),
431 ('', 'keepbranches', False, _('keep original branches')),
432 430 ('s', 'source', '', _('rebase from a given revision')),
433 431 ('b', 'base', '', _('rebase from the base of a given revision')),
434 432 ('d', 'dest', '', _('rebase onto a given revision')),
435 433 ('', 'collapse', False, _('collapse the rebased revisions')),
434 ('', 'keep', False, _('keep original revisions')),
435 ('', 'keepbranches', False, _('keep original branches')),
436 436 ('c', 'continue', False, _('continue an interrupted rebase')),
437 437 ('a', 'abort', False, _('abort an interrupted rebase')),] +
438 438 templateopts,
439 _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | '
440 '[--keep]')),
439 _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] '
440 '[--keepbranches] | [-c] | [-a]')),
441 441 }
Show file before | Show file after | Hide comments
@@ -2,7 +2,7 b''
2 2
3 3 % Use continue and abort
4 4 hg rebase: cannot use both abort and continue
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
6 6
7 7 move changeset (and descendants) to a different branch
8 8
@@ -15,12 +15,12 b' move changeset (and descendants) to a di'
15 15
16 16 options:
17 17
18 --keep keep original revisions
19 --keepbranches keep original branches
20 18 -s --source rebase from a given revision
21 19 -b --base rebase from the base of a given revision
22 20 -d --dest rebase onto a given revision
23 21 --collapse collapse the rebased revisions
22 --keep keep original revisions
23 --keepbranches keep original branches
24 24 -c --continue continue an interrupted rebase
25 25 -a --abort abort an interrupted rebase
26 26 --style display using template map file
@@ -30,7 +30,7 b' use "hg -v help rebase" to show global o'
30 30
31 31 % Use continue and collapse
32 32 hg rebase: cannot use collapse with continue or abort
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
34 34
35 35 move changeset (and descendants) to a different branch
36 36
@@ -43,12 +43,12 b' move changeset (and descendants) to a di'
43 43
44 44 options:
45 45
46 --keep keep original revisions
47 --keepbranches keep original branches
48 46 -s --source rebase from a given revision
49 47 -b --base rebase from the base of a given revision
50 48 -d --dest rebase onto a given revision
51 49 --collapse collapse the rebased revisions
50 --keep keep original revisions
51 --keepbranches keep original branches
52 52 -c --continue continue an interrupted rebase
53 53 -a --abort abort an interrupted rebase
54 54 --style display using template map file
@@ -58,7 +58,7 b' use "hg -v help rebase" to show global o'
58 58
59 59 % Use continue/abort and dest/source
60 60 hg rebase: abort and continue do not allow specifying revisions
61 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
61 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
62 62
63 63 move changeset (and descendants) to a different branch
64 64
@@ -71,12 +71,12 b' move changeset (and descendants) to a di'
71 71
72 72 options:
73 73
74 --keep keep original revisions
75 --keepbranches keep original branches
76 74 -s --source rebase from a given revision
77 75 -b --base rebase from the base of a given revision
78 76 -d --dest rebase onto a given revision
79 77 --collapse collapse the rebased revisions
78 --keep keep original revisions
79 --keepbranches keep original branches
80 80 -c --continue continue an interrupted rebase
81 81 -a --abort abort an interrupted rebase
82 82 --style display using template map file
@@ -86,7 +86,7 b' use "hg -v help rebase" to show global o'
86 86
87 87 % Use source and base
88 88 hg rebase: cannot specify both a revision and a base
89 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
89 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
90 90
91 91 move changeset (and descendants) to a different branch
92 92
@@ -99,12 +99,12 b' move changeset (and descendants) to a di'
99 99
100 100 options:
101 101
102 --keep keep original revisions
103 --keepbranches keep original branches
104 102 -s --source rebase from a given revision
105 103 -b --base rebase from the base of a given revision
106 104 -d --dest rebase onto a given revision
107 105 --collapse collapse the rebased revisions
106 --keep keep original revisions
107 --keepbranches keep original branches
108 108 -c --continue continue an interrupted rebase
109 109 -a --abort abort an interrupted rebase
110 110 --style display using template map file
General Comments 0
You need to be logged in to leave comments. Login now