Mercurial > hg-stable
changeset 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 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Dec 18 18:24:41 2015 +0000 +++ b/hgext/rebase.py Fri Dec 18 18:22:03 2015 +0000 @@ -128,11 +128,11 @@ 3. Use ``--base`` to select a changeset; rebase will find ancestors and their descendants which are not also ancestors of the destination. - By default, rebase recreates the changesets in the source branch - as descendants of dest and then destroys the originals. Use - ``--keep`` to preserve the original source changesets. Some - changesets in the source branch (e.g. merges from the destination - branch) may be dropped if they no longer contribute any change. + Rebase will destroy original changesets unless you use ``--keep``. + It will also move your bookmarks (even if you do). + + Some changesets may be dropped if they do not contribute changes + (e.g. merges from the destination branch). One result of the rules for selecting the destination changeset and source branch is that, unlike ``merge``, rebase will do