[PATCH 2 of 2 STABLE] rebase: mention --rev in help text

Patrick Mezard patrick at mezard.eu
Tue Jul 31 11:49:00 CDT 2012


# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1343752943 -7200
# Branch stable
# Node ID d4210d8e0a45e2e5615d4e7018b37eae32ff8d9c
# Parent  5af184293999952aa1ad103d55353dc832c882a0
rebase: mention --rev in help text

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -53,7 +53,7 @@
     ('c', 'continue', False, _('continue an interrupted rebase')),
     ('a', 'abort', False, _('abort an interrupted rebase'))] +
      templateopts,
-    _('[-s REV | -b REV] [-d REV] [OPTION]'))
+    _('[-s REV | -b REV | -r REV] [-d REV] [OPTION]'))
 def rebase(ui, repo, **opts):
     """move changeset (and descendants) to a different branch
 
@@ -72,17 +72,19 @@
     destination. (The destination changeset is not modified by
     rebasing, but new changesets are added as its descendants.)
 
-    You can specify which changesets to rebase in two ways: as a
-    "source" changeset or as a "base" changeset. Both are shorthand
-    for a topologically related set of changesets (the "source
-    branch"). If you specify source (``-s/--source``), rebase will
-    rebase that changeset and all of its descendants onto dest. If you
-    specify base (``-b/--base``), rebase will select ancestors of base
-    back to but not including the common ancestor with dest. Thus,
-    ``-b`` is less precise but more convenient than ``-s``: you can
-    specify any changeset in the source branch, and rebase will select
-    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
-    uses the parent of the working directory as the base.
+    You can specify which changesets to rebase in three ways: as a
+    "source" changeset, as a "base" changeset or with an explicit list.
+    The first two are shorthand for a topologically related set of
+    changesets (the "source branch"). If you specify source
+    (``-s/--source``), rebase will rebase that changeset and all of its
+    descendants onto dest. If you specify base (``-b/--base``), rebase
+    will select ancestors of base back to but not including the common
+    ancestor with dest. Thus, ``-b`` is less precise but more convenient
+    than ``-s``: you can specify any changeset in the source branch, and
+    rebase will select the whole branch. Finally, changesets can be
+    selected explicitely with ``-r/--rev``, provided they are connected
+    to each other. If you specify neither ``-s``, ``-b`` or ``-r``,
+    rebase uses the parent of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch
     as descendants of dest and then destroys the originals. Use


More information about the Mercurial-devel mailing list