Show More
@@ -467,6 +467,6 b' cmdtable = {' | |||||
467 | ('c', 'continue', False, _('continue an interrupted rebase')), |
|
467 | ('c', 'continue', False, _('continue an interrupted rebase')), | |
468 | ('a', 'abort', False, _('abort an interrupted rebase')),] + |
|
468 | ('a', 'abort', False, _('abort an interrupted rebase')),] + | |
469 | templateopts, |
|
469 | templateopts, | |
470 |
_('hg rebase [-s |
|
470 | _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] ' | |
471 | '[--keepbranches] | [-c] | [-a]')), |
|
471 | '[--keepbranches] | [-c] | [-a]')), | |
472 | } |
|
472 | } |
@@ -3230,7 +3230,7 b' table = {' | |||||
3230 | _('[OPTION]... PATTERN [FILE]...')), |
|
3230 | _('[OPTION]... PATTERN [FILE]...')), | |
3231 | "heads": |
|
3231 | "heads": | |
3232 | (heads, |
|
3232 | (heads, | |
3233 |
[('r', 'rev', '', _('show only heads which are descendants of |
|
3233 | [('r', 'rev', '', _('show only heads which are descendants of REV')), | |
3234 | ('a', 'active', False, |
|
3234 | ('a', 'active', False, | |
3235 | _('show only the active heads from open branches')), |
|
3235 | _('show only the active heads from open branches')), | |
3236 | ] + templateopts, |
|
3236 | ] + templateopts, | |
@@ -3276,7 +3276,7 b' table = {' | |||||
3276 | _('[-e CMD] [--remotecmd CMD] [DEST]')), |
|
3276 | _('[-e CMD] [--remotecmd CMD] [DEST]')), | |
3277 | "locate": |
|
3277 | "locate": | |
3278 | (locate, |
|
3278 | (locate, | |
3279 |
[('r', 'rev', '', _('search the repository as it stood at |
|
3279 | [('r', 'rev', '', _('search the repository as it stood at REV')), | |
3280 | ('0', 'print0', None, |
|
3280 | ('0', 'print0', None, | |
3281 | _('end filenames with NUL, for use with xargs')), |
|
3281 | _('end filenames with NUL, for use with xargs')), | |
3282 | ('f', 'fullpath', None, |
|
3282 | ('f', 'fullpath', None, |
@@ -2,7 +2,7 b'' | |||||
2 |
|
2 | |||
3 | % Use continue and abort |
|
3 | % Use continue and abort | |
4 | hg rebase: cannot use both abort and continue |
|
4 | hg rebase: cannot use both abort and continue | |
5 |
hg rebase [-s |
|
5 | hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | |
6 |
|
6 | |||
7 | move changeset (and descendants) to a different branch |
|
7 | move changeset (and descendants) to a different branch | |
8 |
|
8 | |||
@@ -30,7 +30,7 b' use "hg -v help rebase" to show global o' | |||||
30 |
|
30 | |||
31 | % Use continue and collapse |
|
31 | % Use continue and collapse | |
32 | hg rebase: cannot use collapse with continue or abort |
|
32 | hg rebase: cannot use collapse with continue or abort | |
33 |
hg rebase [-s |
|
33 | hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | |
34 |
|
34 | |||
35 | move changeset (and descendants) to a different branch |
|
35 | move changeset (and descendants) to a different branch | |
36 |
|
36 | |||
@@ -58,7 +58,7 b' use "hg -v help rebase" to show global o' | |||||
58 |
|
58 | |||
59 | % Use continue/abort and dest/source |
|
59 | % Use continue/abort and dest/source | |
60 | hg rebase: abort and continue do not allow specifying revisions |
|
60 | hg rebase: abort and continue do not allow specifying revisions | |
61 |
hg rebase [-s |
|
61 | hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | |
62 |
|
62 | |||
63 | move changeset (and descendants) to a different branch |
|
63 | move changeset (and descendants) to a different branch | |
64 |
|
64 | |||
@@ -86,7 +86,7 b' use "hg -v help rebase" to show global o' | |||||
86 |
|
86 | |||
87 | % Use source and base |
|
87 | % Use source and base | |
88 | hg rebase: cannot specify both a revision and a base |
|
88 | hg rebase: cannot specify both a revision and a base | |
89 |
hg rebase [-s |
|
89 | hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | |
90 |
|
90 | |||
91 | move changeset (and descendants) to a different branch |
|
91 | move changeset (and descendants) to a different branch | |
92 |
|
92 |
General Comments 0
You need to be logged in to leave comments.
Login now