##// END OF EJS Templates
rebase: stress that only local changesets should be rebased
Martin Geisler -
r11188:b5c0f6a1 stable
parent child Browse files
Show More
@@ -29,9 +29,14 b' def rebase(ui, repo, **opts):'
29
29
30 Rebase uses repeated merging to graft changesets from one part of
30 Rebase uses repeated merging to graft changesets from one part of
31 history (the source) onto another (the destination). This can be
31 history (the source) onto another (the destination). This can be
32 useful for linearizing local changes relative to a master
32 useful for linearizing *local* changes relative to a master
33 development tree.
33 development tree.
34
34
35 You should not rebase changesets that have already been shared
36 with others. Doing so will force everybody else to perform the
37 same rebase or they will end up with duplicated changesets after
38 pulling in your rebased changesets.
39
35 If you don't specify a destination changeset (``-d/--dest``),
40 If you don't specify a destination changeset (``-d/--dest``),
36 rebase uses the tipmost head of the current named branch as the
41 rebase uses the tipmost head of the current named branch as the
37 destination. (The destination changeset is not modified by
42 destination. (The destination changeset is not modified by
@@ -9,7 +9,12 b' move changeset (and descendants) to a di'
9
9
10 Rebase uses repeated merging to graft changesets from one part of history
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
11 (the source) onto another (the destination). This can be useful for
12 linearizing local changes relative to a master development tree.
12 linearizing *local* changes relative to a master development tree.
13
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
17 changesets.
13
18
14 If you don't specify a destination changeset ("-d/--dest"), rebase uses
19 If you don't specify a destination changeset ("-d/--dest"), rebase uses
15 the tipmost head of the current named branch as the destination. (The
20 the tipmost head of the current named branch as the destination. (The
@@ -68,7 +73,12 b' move changeset (and descendants) to a di'
68
73
69 Rebase uses repeated merging to graft changesets from one part of history
74 Rebase uses repeated merging to graft changesets from one part of history
70 (the source) onto another (the destination). This can be useful for
75 (the source) onto another (the destination). This can be useful for
71 linearizing local changes relative to a master development tree.
76 linearizing *local* changes relative to a master development tree.
77
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
81 changesets.
72
82
73 If you don't specify a destination changeset ("-d/--dest"), rebase uses
83 If you don't specify a destination changeset ("-d/--dest"), rebase uses
74 the tipmost head of the current named branch as the destination. (The
84 the tipmost head of the current named branch as the destination. (The
@@ -127,7 +137,12 b' move changeset (and descendants) to a di'
127
137
128 Rebase uses repeated merging to graft changesets from one part of history
138 Rebase uses repeated merging to graft changesets from one part of history
129 (the source) onto another (the destination). This can be useful for
139 (the source) onto another (the destination). This can be useful for
130 linearizing local changes relative to a master development tree.
140 linearizing *local* changes relative to a master development tree.
141
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
145 changesets.
131
146
132 If you don't specify a destination changeset ("-d/--dest"), rebase uses
147 If you don't specify a destination changeset ("-d/--dest"), rebase uses
133 the tipmost head of the current named branch as the destination. (The
148 the tipmost head of the current named branch as the destination. (The
@@ -186,7 +201,12 b' move changeset (and descendants) to a di'
186
201
187 Rebase uses repeated merging to graft changesets from one part of history
202 Rebase uses repeated merging to graft changesets from one part of history
188 (the source) onto another (the destination). This can be useful for
203 (the source) onto another (the destination). This can be useful for
189 linearizing local changes relative to a master development tree.
204 linearizing *local* changes relative to a master development tree.
205
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
209 changesets.
190
210
191 If you don't specify a destination changeset ("-d/--dest"), rebase uses
211 If you don't specify a destination changeset ("-d/--dest"), rebase uses
192 the tipmost head of the current named branch as the destination. (The
212 the tipmost head of the current named branch as the destination. (The
General Comments 0
You need to be logged in to leave comments. Login now