Mercurial > hg
comparison hgext/rebase.py @ 27456:2337958596e3
rebase: simplify documentation about --keep
Also include a warning about bookmarks
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 18 Dec 2015 18:22:03 +0000 |
parents | a9a047878e14 |
children | 97cc045f1cfe |
comparison
equal
deleted
inserted
replaced
27455:a9a047878e14 | 27456:2337958596e3 |
---|---|
126 descendants. | 126 descendants. |
127 | 127 |
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 |
139 nothing if you are at the branch tip of a named branch | 139 nothing if you are at the branch tip of a named branch |
140 with two heads. You need to explicitly specify source and/or | 140 with two heads. You need to explicitly specify source and/or |