comparison hgext/rebase.py @ 18518:0324a1d88a53 stable

rebase: mention --rev in the help This changeset adds a small mention of it in the help to prevent confusion. This small addition references online help that is easier to update and improve at release time. Following Wagner Bruna's advice, this is added in a plain new paragraph to not invalidate current translation this close to the release.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 01 Feb 2013 02:01:11 +0100
parents 9fbeb61b8ad2
children 12de53323e59
comparison
equal deleted inserted replaced
18517:0c51532ec233 18518:0324a1d88a53
85 back to but not including the common ancestor with dest. Thus, 85 back to but not including the common ancestor with dest. Thus,
86 ``-b`` is less precise but more convenient than ``-s``: you can 86 ``-b`` is less precise but more convenient than ``-s``: you can
87 specify any changeset in the source branch, and rebase will select 87 specify any changeset in the source branch, and rebase will select
88 the whole branch. If you specify neither ``-s`` nor ``-b``, rebase 88 the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
89 uses the parent of the working directory as the base. 89 uses the parent of the working directory as the base.
90
91 For advanced usage, a third way is available through the ``--rev``
92 option. It allows you to specify an arbitrary set of changesets to
93 rebase. Descendants of revs you specify with this option are not
94 automatically included in the rebase.
90 95
91 By default, rebase recreates the changesets in the source branch 96 By default, rebase recreates the changesets in the source branch
92 as descendants of dest and then destroys the originals. Use 97 as descendants of dest and then destroys the originals. Use
93 ``--keep`` to preserve the original source changesets. Some 98 ``--keep`` to preserve the original source changesets. Some
94 changesets in the source branch (e.g. merges from the destination 99 changesets in the source branch (e.g. merges from the destination