Skip to content
Snippets Groups Projects
Commit 2337958596e3 authored by timeless's avatar timeless
Browse files

rebase: simplify documentation about --keep

Also include a warning about bookmarks
parent a9a047878e14
No related branches found
No related tags found
No related merge requests found
...@@ -128,11 +128,11 @@ ...@@ -128,11 +128,11 @@
3. Use ``--base`` to select a changeset; rebase will find ancestors 3. Use ``--base`` to select a changeset; rebase will find ancestors
and their descendants which are not also ancestors of the destination. and their descendants which are not also ancestors of the destination.
By default, rebase recreates the changesets in the source branch Rebase will destroy original changesets unless you use ``--keep``.
as descendants of dest and then destroys the originals. Use It will also move your bookmarks (even if you do).
``--keep`` to preserve the original source changesets. Some
changesets in the source branch (e.g. merges from the destination Some changesets may be dropped if they do not contribute changes
branch) may be dropped if they no longer contribute any change. (e.g. merges from the destination branch).
One result of the rules for selecting the destination changeset One result of the rules for selecting the destination changeset
and source branch is that, unlike ``merge``, rebase will do and source branch is that, unlike ``merge``, rebase will do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment