equal
deleted
inserted
replaced
132 It will also move your bookmarks (even if you do). |
132 It will also move your bookmarks (even if you do). |
133 |
133 |
134 Some changesets may be dropped if they do not contribute changes |
134 Some changesets may be dropped if they do not contribute changes |
135 (e.g. merges from the destination branch). |
135 (e.g. merges from the destination branch). |
136 |
136 |
137 One result of the rules for selecting the destination changeset |
137 Unlike ``merge``, rebase will do nothing if you are at the branch tip of |
138 and source branch is that, unlike ``merge``, rebase will do |
138 a named branch with two heads. You will need to explicitly specify source |
139 nothing if you are at the branch tip of a named branch |
139 and/or destination. |
140 with two heads. You need to explicitly specify source and/or |
|
141 destination (or ``update`` to the other head, if it's the head of |
|
142 the intended source branch). |
|
143 |
140 |
144 If a rebase is interrupted to manually resolve a merge, it can be |
141 If a rebase is interrupted to manually resolve a merge, it can be |
145 continued with --continue/-c or aborted with --abort/-a. |
142 continued with --continue/-c or aborted with --abort/-a. |
146 |
143 |
147 .. container:: verbose |
144 .. container:: verbose |