Mercurial > public > mercurial-scm > hg
diff hgext/rebase.py @ 11188:b5c0f6a11430 stable
rebase: stress that only local changesets should be rebased
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 17 May 2010 21:16:35 +0200 |
parents | 129e96f7a87a |
children | 3ef2572de32f |
line wrap: on
line diff
--- a/hgext/rebase.py Mon May 17 20:42:28 2010 +0200 +++ b/hgext/rebase.py Mon May 17 21:16:35 2010 +0200 @@ -29,9 +29,14 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be - useful for linearizing local changes relative to a master + 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. + If you don't specify a destination changeset (``-d/--dest``), rebase uses the tipmost head of the current named branch as the destination. (The destination changeset is not modified by