Show More
@@ -72,9 +72,9 b' def rebase(ui, repo, **opts):' | |||||
72 | rebasing published changes. See :hg:`help phases` for details. |
|
72 | rebasing published changes. See :hg:`help phases` for details. | |
73 |
|
73 | |||
74 | If you don't specify a destination changeset (``-d/--dest``), |
|
74 | If you don't specify a destination changeset (``-d/--dest``), | |
75 |
rebase uses the |
|
75 | rebase uses the current branch tip as the destination. (The | |
76 |
destination |
|
76 | destination changeset is not modified by rebasing, but new | |
77 |
|
|
77 | changesets are added as its descendants.) | |
78 |
|
78 | |||
79 | You can specify which changesets to rebase in two ways: as a |
|
79 | You can specify which changesets to rebase in two ways: as a | |
80 | "source" changeset or as a "base" changeset. Both are shorthand |
|
80 | "source" changeset or as a "base" changeset. Both are shorthand | |
@@ -101,7 +101,7 b' def rebase(ui, repo, **opts):' | |||||
101 |
|
101 | |||
102 | One result of the rules for selecting the destination changeset |
|
102 | One result of the rules for selecting the destination changeset | |
103 | and source branch is that, unlike ``merge``, rebase will do |
|
103 | and source branch is that, unlike ``merge``, rebase will do | |
104 |
nothing if you are at the |
|
104 | nothing if you are at the branch tip of a named branch | |
105 | with two heads. You need to explicitly specify source and/or |
|
105 | with two heads. You need to explicitly specify source and/or | |
106 | destination (or ``update`` to the other head, if it's the head of |
|
106 | destination (or ``update`` to the other head, if it's the head of | |
107 | the intended source branch). |
|
107 | the intended source branch). |
General Comments 0
You need to be logged in to leave comments.
Login now