Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: simplify documentation about --keep
authortimeless <timeless@mozdev.org>
Fri, 18 Dec 2015 18:22:03 +0000
changeset 27456 2337958596e3
parent 27455 a9a047878e14
child 27457 97cc045f1cfe
rebase: simplify documentation about --keep Also include a warning about bookmarks
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial