3
3
% Use continue and abort
4
hg rebase: cannot use both abort and continue
5
hg rebase [-s REV | -b REV] [-d REV] [options]
8
move changeset (and descendants) to a different branch
10
Rebase uses repeated merging to graft changesets from one part of history
11
(the source) onto another (the destination). This can be useful for
12
linearizing *local* changes relative to a master development tree.
14
You should not rebase changesets that have already been shared with
15
others. Doing so will force everybody else to perform the same rebase or
16
they will end up with duplicated changesets after pulling in your rebased
19
If you don't specify a destination changeset ("-d/--dest"), rebase uses
20
the tipmost head of the current named branch as the destination. (The
21
destination changeset is not modified by rebasing, but new changesets are
22
added as its descendants.)
24
You can specify which changesets to rebase in two ways: as a "source"
25
changeset or as a "base" changeset. Both are shorthand for a topologically
26
related set of changesets (the "source branch"). If you specify source
27
("-s/--source"), rebase will rebase that changeset and all of its
28
descendants onto dest. If you specify base ("-b/--base"), rebase will
29
select ancestors of base back to but not including the common ancestor
30
with dest. Thus, "-b" is less precise but more convenient than "-s": you
31
can specify any changeset in the source branch, and rebase will select the
32
whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
33
of the working directory as the base.
35
By default, rebase recreates the changesets in the source branch as
36
descendants of dest and then destroys the originals. Use "--keep" to
37
preserve the original source changesets. Some changesets in the source
38
branch (e.g. merges from the destination branch) may be dropped if they no
39
longer contribute any change.
41
One result of the rules for selecting the destination changeset and source
42
branch is that, unlike "merge", rebase will do nothing if you are at the
43
latest (tipmost) head of a named branch with two heads. You need to
44
explicitly specify source and/or destination (or "update" to the other
45
head, if it's the head of the intended source branch).
47
If a rebase is interrupted to manually resolve a merge, it can be
48
continued with --continue/-c or aborted with --abort/-a.
52
-s --source rebase from the specified changeset
53
-b --base rebase from the base of the specified changeset (up to
54
greatest common ancestor of base and dest)
55
-d --dest rebase onto the specified changeset
56
--collapse collapse the rebased changesets
57
--keep keep original changesets
58
--keepbranches keep original branch names
59
--detach force detaching of source from its original branch
60
-c --continue continue an interrupted rebase
61
-a --abort abort an interrupted rebase
62
--style display using template map file
63
--template display with template
65
use "hg -v help rebase" to show global options
4
abort: cannot use both abort and continue
67
6
% Use continue and collapse
68
hg rebase: cannot use collapse with continue or abort
69
hg rebase [-s REV | -b REV] [-d REV] [options]
72
move changeset (and descendants) to a different branch
74
Rebase uses repeated merging to graft changesets from one part of history
75
(the source) onto another (the destination). This can be useful for
76
linearizing *local* changes relative to a master development tree.
78
You should not rebase changesets that have already been shared with
79
others. Doing so will force everybody else to perform the same rebase or
80
they will end up with duplicated changesets after pulling in your rebased
83
If you don't specify a destination changeset ("-d/--dest"), rebase uses
84
the tipmost head of the current named branch as the destination. (The
85
destination changeset is not modified by rebasing, but new changesets are
86
added as its descendants.)
88
You can specify which changesets to rebase in two ways: as a "source"
89
changeset or as a "base" changeset. Both are shorthand for a topologically
90
related set of changesets (the "source branch"). If you specify source
91
("-s/--source"), rebase will rebase that changeset and all of its
92
descendants onto dest. If you specify base ("-b/--base"), rebase will
93
select ancestors of base back to but not including the common ancestor
94
with dest. Thus, "-b" is less precise but more convenient than "-s": you
95
can specify any changeset in the source branch, and rebase will select the
96
whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
97
of the working directory as the base.
99
By default, rebase recreates the changesets in the source branch as
100
descendants of dest and then destroys the originals. Use "--keep" to
101
preserve the original source changesets. Some changesets in the source
102
branch (e.g. merges from the destination branch) may be dropped if they no
103
longer contribute any change.
105
One result of the rules for selecting the destination changeset and source
106
branch is that, unlike "merge", rebase will do nothing if you are at the
107
latest (tipmost) head of a named branch with two heads. You need to
108
explicitly specify source and/or destination (or "update" to the other
109
head, if it's the head of the intended source branch).
111
If a rebase is interrupted to manually resolve a merge, it can be
112
continued with --continue/-c or aborted with --abort/-a.
116
-s --source rebase from the specified changeset
117
-b --base rebase from the base of the specified changeset (up to
118
greatest common ancestor of base and dest)
119
-d --dest rebase onto the specified changeset
120
--collapse collapse the rebased changesets
121
--keep keep original changesets
122
--keepbranches keep original branch names
123
--detach force detaching of source from its original branch
124
-c --continue continue an interrupted rebase
125
-a --abort abort an interrupted rebase
126
--style display using template map file
127
--template display with template
129
use "hg -v help rebase" to show global options
7
abort: cannot use collapse with continue or abort
131
9
% Use continue/abort and dest/source
132
hg rebase: abort and continue do not allow specifying revisions
133
hg rebase [-s REV | -b REV] [-d REV] [options]
136
move changeset (and descendants) to a different branch
138
Rebase uses repeated merging to graft changesets from one part of history
139
(the source) onto another (the destination). This can be useful for
140
linearizing *local* changes relative to a master development tree.
142
You should not rebase changesets that have already been shared with
143
others. Doing so will force everybody else to perform the same rebase or
144
they will end up with duplicated changesets after pulling in your rebased
147
If you don't specify a destination changeset ("-d/--dest"), rebase uses
148
the tipmost head of the current named branch as the destination. (The
149
destination changeset is not modified by rebasing, but new changesets are
150
added as its descendants.)
152
You can specify which changesets to rebase in two ways: as a "source"
153
changeset or as a "base" changeset. Both are shorthand for a topologically
154
related set of changesets (the "source branch"). If you specify source
155
("-s/--source"), rebase will rebase that changeset and all of its
156
descendants onto dest. If you specify base ("-b/--base"), rebase will
157
select ancestors of base back to but not including the common ancestor
158
with dest. Thus, "-b" is less precise but more convenient than "-s": you
159
can specify any changeset in the source branch, and rebase will select the
160
whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
161
of the working directory as the base.
163
By default, rebase recreates the changesets in the source branch as
164
descendants of dest and then destroys the originals. Use "--keep" to
165
preserve the original source changesets. Some changesets in the source
166
branch (e.g. merges from the destination branch) may be dropped if they no
167
longer contribute any change.
169
One result of the rules for selecting the destination changeset and source
170
branch is that, unlike "merge", rebase will do nothing if you are at the
171
latest (tipmost) head of a named branch with two heads. You need to
172
explicitly specify source and/or destination (or "update" to the other
173
head, if it's the head of the intended source branch).
175
If a rebase is interrupted to manually resolve a merge, it can be
176
continued with --continue/-c or aborted with --abort/-a.
180
-s --source rebase from the specified changeset
181
-b --base rebase from the base of the specified changeset (up to
182
greatest common ancestor of base and dest)
183
-d --dest rebase onto the specified changeset
184
--collapse collapse the rebased changesets
185
--keep keep original changesets
186
--keepbranches keep original branch names
187
--detach force detaching of source from its original branch
188
-c --continue continue an interrupted rebase
189
-a --abort abort an interrupted rebase
190
--style display using template map file
191
--template display with template
193
use "hg -v help rebase" to show global options
10
abort: abort and continue do not allow specifying revisions
195
12
% Use source and base
196
hg rebase: cannot specify both a revision and a base
197
hg rebase [-s REV | -b REV] [-d REV] [options]
200
move changeset (and descendants) to a different branch
202
Rebase uses repeated merging to graft changesets from one part of history
203
(the source) onto another (the destination). This can be useful for
204
linearizing *local* changes relative to a master development tree.
206
You should not rebase changesets that have already been shared with
207
others. Doing so will force everybody else to perform the same rebase or
208
they will end up with duplicated changesets after pulling in your rebased
211
If you don't specify a destination changeset ("-d/--dest"), rebase uses
212
the tipmost head of the current named branch as the destination. (The
213
destination changeset is not modified by rebasing, but new changesets are
214
added as its descendants.)
216
You can specify which changesets to rebase in two ways: as a "source"
217
changeset or as a "base" changeset. Both are shorthand for a topologically
218
related set of changesets (the "source branch"). If you specify source
219
("-s/--source"), rebase will rebase that changeset and all of its
220
descendants onto dest. If you specify base ("-b/--base"), rebase will
221
select ancestors of base back to but not including the common ancestor
222
with dest. Thus, "-b" is less precise but more convenient than "-s": you
223
can specify any changeset in the source branch, and rebase will select the
224
whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
225
of the working directory as the base.
227
By default, rebase recreates the changesets in the source branch as
228
descendants of dest and then destroys the originals. Use "--keep" to
229
preserve the original source changesets. Some changesets in the source
230
branch (e.g. merges from the destination branch) may be dropped if they no
231
longer contribute any change.
233
One result of the rules for selecting the destination changeset and source
234
branch is that, unlike "merge", rebase will do nothing if you are at the
235
latest (tipmost) head of a named branch with two heads. You need to
236
explicitly specify source and/or destination (or "update" to the other
237
head, if it's the head of the intended source branch).
239
If a rebase is interrupted to manually resolve a merge, it can be
240
continued with --continue/-c or aborted with --abort/-a.
244
-s --source rebase from the specified changeset
245
-b --base rebase from the base of the specified changeset (up to
246
greatest common ancestor of base and dest)
247
-d --dest rebase onto the specified changeset
248
--collapse collapse the rebased changesets
249
--keep keep original changesets
250
--keepbranches keep original branch names
251
--detach force detaching of source from its original branch
252
-c --continue continue an interrupted rebase
253
-a --abort abort an interrupted rebase
254
--style display using template map file
255
--template display with template
257
use "hg -v help rebase" to show global options
13
abort: cannot specify both a revision and a base
259
15
% Rebase with no arguments - from current
added
removed
tests/test-rebase-parameters.out
