Mercurial > hg

comparison hgext/rebase.py @ 18516:9fbeb61b8ad2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: mention phases in the help Mention that Mercurial helps you not do what you've just been warned not to do, with a reference to the 'phases' help topic (not the 'phase' command help). Thanks to Pierre-Yves David <pierre-yves.david@ens-lyon.org> for motivating this change and Wagner Bruna <wagner.bruna+mercurial@gmail.com> for advising on how to do it in an i18n-friendly way.
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 31 Jan 2013 20:01:26 -0600
parents 2a1fac3650a5
children 0324a1d88a53
comparison
equal deleted inserted replaced
18515:bf8bbbf4aa45 18516:9fbeb61b8ad2
65 65
66 You should not rebase changesets that have already been shared 66 You should not rebase changesets that have already been shared
67 with others. Doing so will force everybody else to perform the 67 with others. Doing so will force everybody else to perform the
68 same rebase or they will end up with duplicated changesets after 68 same rebase or they will end up with duplicated changesets after
69 pulling in your rebased changesets. 69 pulling in your rebased changesets.
70
71 In its default configuration, Mercurial will prevent you from
72 rebasing published changes. See :hg:`help phases` for details.
70 73
71 If you don't specify a destination changeset (``-d/--dest``), 74 If you don't specify a destination changeset (``-d/--dest``),
72 rebase uses the tipmost head of the current named branch as the 75 rebase uses the tipmost head of the current named branch as the
73 destination. (The destination changeset is not modified by 76 destination. (The destination changeset is not modified by
74 rebasing, but new changesets are added as its descendants.) 77 rebasing, but new changesets are added as its descendants.)