##// END OF EJS Templates
rebase: simplify documentation about selecting commits to rebase
timeless -
r27455:a9a04787 default
parent child Browse files
Show More
@@ -118,22 +118,15 b' def rebase(ui, repo, **opts):'
118 destination changeset is not modified by rebasing, but new
118 destination changeset is not modified by rebasing, but new
119 changesets are added as its descendants.)
119 changesets are added as its descendants.)
120
120
121 You can specify which changesets to rebase in two ways: as a
121 There are three ways to select changesets::
122 "source" changeset or as a "base" changeset. Both are shorthand
122
123 for a topologically related set of changesets (the "source
123 1. Explicitly select them using ``--rev``.
124 branch"). If you specify source (``-s/--source``), rebase will
125 rebase that changeset and all of its descendants onto dest. If you
126 specify base (``-b/--base``), rebase will select ancestors of base
127 back to but not including the common ancestor with dest. Thus,
128 ``-b`` is less precise but more convenient than ``-s``: you can
129 specify any changeset in the source branch, and rebase will select
130 the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
131 uses the parent of the working directory as the base.
132
124
133 For advanced usage, a third way is available through the ``--rev``
125 2. Use ``--source`` to select a root changeset and include all of its
134 option. It allows you to specify an arbitrary set of changesets to
126 descendants.
135 rebase. Descendants of revs you specify with this option are not
127
136 automatically included in the rebase.
128 3. Use ``--base`` to select a changeset; rebase will find ancestors
129 and their descendants which are not also ancestors of the destination.
137
130
138 By default, rebase recreates the changesets in the source branch
131 By default, rebase recreates the changesets in the source branch
139 as descendants of dest and then destroys the originals. Use
132 as descendants of dest and then destroys the originals. Use
General Comments 0
You need to be logged in to leave comments. Login now