comparison hgext/rebase.py @ 27454:3e3be524a712

rebase: simplify documentation about public commits add reference to graft
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:06:43 +0000
parents 43c00ca887d1
children a9a047878e14
comparison
equal deleted inserted replaced
27453:8462d7f2c4fe 27454:3e3be524a712
108 Rebase uses repeated merging to graft changesets from one part of 108 Rebase uses repeated merging to graft changesets from one part of
109 history (the source) onto another (the destination). This can be 109 history (the source) onto another (the destination). This can be
110 useful for linearizing *local* changes relative to a master 110 useful for linearizing *local* changes relative to a master
111 development tree. 111 development tree.
112 112
113 You should not rebase changesets that have already been shared 113 Published commits cannot be rebased (see :hg:`help phases`).
114 with others. Doing so will force everybody else to perform the 114 To copy commits, see :hg:`help graft`.
115 same rebase or they will end up with duplicated changesets after
116 pulling in your rebased changesets.
117
118 In its default configuration, Mercurial will prevent you from
119 rebasing published changes. See :hg:`help phases` for details.
120 115
121 If you don't specify a destination changeset (``-d/--dest``), 116 If you don't specify a destination changeset (``-d/--dest``),
122 rebase uses the current branch tip as the destination. (The 117 rebase uses the current branch tip as the destination. (The
123 destination changeset is not modified by rebasing, but new 118 destination changeset is not modified by rebasing, but new
124 changesets are added as its descendants.) 119 changesets are added as its descendants.)