Patchwork [4,of,5] rebase: simplify documentation about heads

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 18, 2015, 6:59 p.m.
Message ID <c3b75502cea61864a9a4.1450465165@waste.org>
Download mbox | patch
Permalink /patch/12162/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 18, 2015, 6:59 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450463505 0
#      Fri Dec 18 18:31:45 2015 +0000
# Node ID c3b75502cea61864a9a4f7b9d916443430de09ab
# Parent  9a97dd525927e7b2422d2e0975f394a01baee245
rebase: simplify documentation about heads

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -134,12 +134,9 @@ 
     Some changesets may be dropped if they do not contribute changes
     (e.g. merges from the destination branch).
 
-    One result of the rules for selecting the destination changeset
-    and source branch is that, unlike ``merge``, rebase will do
-    nothing if you are at the branch tip of a named branch
-    with two heads. You need to explicitly specify source and/or
-    destination (or ``update`` to the other head, if it's the head of
-    the intended source branch).
+    Unlike ``merge``, rebase will do nothing if you are at the branch tip of
+    a named branch with two heads. You will need to explicitly specify source
+    and/or destination.
 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.