Mercurial > hg

comparison tests/test-rebase-parameters.out @ 7999:b25110140573

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: word-wrap help texts at 70 characters
author Martin Geisler <mg@daimi.au.dk>
date Sat, 04 Apr 2009 23:19:11 +0200
parents 4d9e8efb7326
children 813a02a4eda2
comparison
equal deleted inserted replaced
7998:e2c55c4a25e2 7999:b25110140573
4 hg rebase: cannot use both abort and continue 4 hg rebase: cannot use both abort and continue
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] 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
9 Rebase uses repeated merging to graft changesets from one part of history 9 Rebase uses repeated merging to graft changesets from one part of
10 onto another. This can be useful for linearizing local changes relative to 10 history onto another. This can be useful for linearizing local
11 a master development tree. 11 changes relative to a master development tree.
12 12
13 If a rebase is interrupted to manually resolve a merge, it can be continued 13 If a rebase is interrupted to manually resolve a merge, it can be
14 with --continue or aborted with --abort. 14 continued with --continue or aborted with --abort.
15 15
16 options: 16 options:
17 17
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
32 hg rebase: cannot use collapse with continue or abort 32 hg rebase: cannot use collapse with continue or abort
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] 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
37 Rebase uses repeated merging to graft changesets from one part of history 37 Rebase uses repeated merging to graft changesets from one part of
38 onto another. This can be useful for linearizing local changes relative to 38 history onto another. This can be useful for linearizing local
39 a master development tree. 39 changes relative to a master development tree.
40 40
41 If a rebase is interrupted to manually resolve a merge, it can be continued 41 If a rebase is interrupted to manually resolve a merge, it can be
42 with --continue or aborted with --abort. 42 continued with --continue or aborted with --abort.
43 43
44 options: 44 options:
45 45
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
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 rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] 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
65 Rebase uses repeated merging to graft changesets from one part of history 65 Rebase uses repeated merging to graft changesets from one part of
66 onto another. This can be useful for linearizing local changes relative to 66 history onto another. This can be useful for linearizing local
67 a master development tree. 67 changes relative to a master development tree.
68 68
69 If a rebase is interrupted to manually resolve a merge, it can be continued 69 If a rebase is interrupted to manually resolve a merge, it can be
70 with --continue or aborted with --abort. 70 continued with --continue or aborted with --abort.
71 71
72 options: 72 options:
73 73
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
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 rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] 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
93 Rebase uses repeated merging to graft changesets from one part of history 93 Rebase uses repeated merging to graft changesets from one part of
94 onto another. This can be useful for linearizing local changes relative to 94 history onto another. This can be useful for linearizing local
95 a master development tree. 95 changes relative to a master development tree.
96 96
97 If a rebase is interrupted to manually resolve a merge, it can be continued 97 If a rebase is interrupted to manually resolve a merge, it can be
98 with --continue or aborted with --abort. 98 continued with --continue or aborted with --abort.
99 99
100 options: 100 options:
101 101
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