Patchwork [1,of,5] rebase: simplify documentation about public commits

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

Comments

timeless@mozdev.org - Dec. 18, 2015, 6:59 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450462003 0
#      Fri Dec 18 18:06:43 2015 +0000
# Node ID 25ec09d5ac96141e8ece7fda6b7fbf613ade966f
# Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
rebase: simplify documentation about public commits

add reference to graft

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -110,13 +110,8 @@ 
     useful for linearizing *local* changes relative to a master
     development tree.
 
-    You should not rebase changesets that have already been shared
-    with others. Doing so will force everybody else to perform the
-    same rebase or they will end up with duplicated changesets after
-    pulling in your rebased changesets.
-
-    In its default configuration, Mercurial will prevent you from
-    rebasing published changes. See :hg:`help phases` for details.
+    Published commits cannot be rebased (see :hg:`help phases`).
+    To copy commits, see :hg:`help graft`.
 
     If you don't specify a destination changeset (``-d/--dest``),
     rebase uses the current branch tip as the destination. (The