Mercurial > hg
comparison hgext/rebase.py @ 27932:6bc2299cc12f stable
rebase: restore help for rebase w/o args (issue5059)
Restoring documentation accidentally removed in a9a047878e14.
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 22 Jan 2016 20:32:47 +0000 |
parents | f54bf1f41566 |
children | f3eb98b8fe12 |
comparison
equal
deleted
inserted
replaced
27931:1289a122cf3f | 27932:6bc2299cc12f |
---|---|
119 If you don't specify a destination changeset (``-d/--dest``), | 119 If you don't specify a destination changeset (``-d/--dest``), |
120 rebase uses the current branch tip as the destination. (The | 120 rebase uses the current branch tip as the destination. (The |
121 destination changeset is not modified by rebasing, but new | 121 destination changeset is not modified by rebasing, but new |
122 changesets are added as its descendants.) | 122 changesets are added as its descendants.) |
123 | 123 |
124 There are three ways to select changesets:: | 124 Here are the ways to select changesets:: |
125 | 125 |
126 1. Explicitly select them using ``--rev``. | 126 1. Explicitly select them using ``--rev``. |
127 | 127 |
128 2. Use ``--source`` to select a root changeset and include all of its | 128 2. Use ``--source`` to select a root changeset and include all of its |
129 descendants. | 129 descendants. |
130 | 130 |
131 3. Use ``--base`` to select a changeset; rebase will find ancestors | 131 3. Use ``--base`` to select a changeset; rebase will find ancestors |
132 and their descendants which are not also ancestors of the destination. | 132 and their descendants which are not also ancestors of the destination. |
133 | |
134 4. If you do not specify any of ``--rev``, ``source``, or ``--base``, | |
135 rebase will use ``--base .`` as above. | |
133 | 136 |
134 Rebase will destroy original changesets unless you use ``--keep``. | 137 Rebase will destroy original changesets unless you use ``--keep``. |
135 It will also move your bookmarks (even if you do). | 138 It will also move your bookmarks (even if you do). |
136 | 139 |
137 Some changesets may be dropped if they do not contribute changes | 140 Some changesets may be dropped if they do not contribute changes |