Show More
@@ -134,12 +134,9 b' def rebase(ui, repo, **opts):' | |||||
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. |
General Comments 0
You need to be logged in to leave comments.
Login now