Mercurial > hg
changeset 19398:f7bcc2e56279
rebase: simplify references to branch tips
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 11 Jul 2013 19:26:34 -0500 |
| parents | 42fc6c7c4ad5 |
| children | 02465cafb0a9 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Jul 11 19:25:44 2013 -0500 +++ b/hgext/rebase.py Thu Jul 11 19:26:34 2013 -0500 @@ -72,9 +72,9 @@ rebasing published changes. See :hg:`help phases` for details. 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 - rebasing, but new changesets are added as its descendants.) + rebase uses the current branch tip as the destination. (The + destination changeset is not modified by rebasing, but new + changesets are added as its descendants.) You can specify which changesets to rebase in two ways: as a "source" changeset or as a "base" changeset. Both are shorthand @@ -101,7 +101,7 @@ 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 latest (tipmost) head of a named branch + 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).