##// END OF EJS Templates
rebase: simplify documentation about --keep...
timeless -
r27456:23379585 default
parent child Browse files
Show More
@@ -128,11 +128,11 b' def rebase(ui, repo, **opts):'
128 3. Use ``--base`` to select a changeset; rebase will find ancestors
128 3. Use ``--base`` to select a changeset; rebase will find ancestors
129 and their descendants which are not also ancestors of the destination.
129 and their descendants which are not also ancestors of the destination.
130
130
131 By default, rebase recreates the changesets in the source branch
131 Rebase will destroy original changesets unless you use ``--keep``.
132 as descendants of dest and then destroys the originals. Use
132 It will also move your bookmarks (even if you do).
133 ``--keep`` to preserve the original source changesets. Some
133
134 changesets in the source branch (e.g. merges from the destination
134 Some changesets may be dropped if they do not contribute changes
135 branch) may be dropped if they no longer contribute any change.
135 (e.g. merges from the destination branch).
136
136
137 One result of the rules for selecting the destination changeset
137 One result of the rules for selecting the destination changeset
138 and source branch is that, unlike ``merge``, rebase will do
138 and source branch is that, unlike ``merge``, rebase will do
General Comments 0
You need to be logged in to leave comments. Login now