Patchwork [STABLE] rebase: restore help for rebase w/o args (issue5059)

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 22, 2016, 8:39 p.m.
Message ID <eb07ca21f179623b4767.1453495159@waste.org>
Download mbox | patch
Permalink /patch/12871/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 22, 2016, 8:39 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1453494767 0
#      Fri Jan 22 20:32:47 2016 +0000
# Branch stable
# Node ID eb07ca21f179623b4767afc0b20ac272169755e3
# Parent  4c6053a6b17d682b34fb88bbeb5e94ed9085d900
rebase: restore help for rebase w/o args (issue5059)

Restoring documentation accidentally removed in a9a047878e14.
Pierre-Yves David - Jan. 22, 2016, 9:31 p.m.
On 01/22/2016 12:39 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1453494767 0
> #      Fri Jan 22 20:32:47 2016 +0000
> # Branch stable
> # Node ID eb07ca21f179623b4767afc0b20ac272169755e3
> # Parent  4c6053a6b17d682b34fb88bbeb5e94ed9085d900
> rebase: restore help for rebase w/o args (issue5059)

Pushed to the clowncopter, thanks

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -121,7 +121,7 @@ 
     destination changeset is not modified by rebasing, but new
     changesets are added as its descendants.)
 
-    There are three ways to select changesets::
+    Here are the ways to select changesets::
 
       1. Explicitly select them using ``--rev``.
 
@@ -131,6 +131,9 @@ 
       3. Use ``--base`` to select a changeset; rebase will find ancestors
       and their descendants which are not also ancestors of the destination.
 
+      4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
+      rebase will use ``--base .`` as above.
+
     Rebase will destroy original changesets unless you use ``--keep``.
     It will also move your bookmarks (even if you do).