36 rebase uses the tipmost head of the current named branch as the |
36 rebase uses the tipmost head of the current named branch as the |
37 destination. (The destination changeset is not modified by |
37 destination. (The destination changeset is not modified by |
38 rebasing, but new changesets are added as its descendants.) |
38 rebasing, but new changesets are added as its descendants.) |
39 |
39 |
40 You can specify which changesets to rebase in two ways: as a |
40 You can specify which changesets to rebase in two ways: as a |
41 \"source\" changeset or as a \"base\" changeset. Both are |
41 "source" changeset or as a "base" changeset. Both are shorthand |
42 shorthand for a topologically related set of changesets (the |
42 for a topologically related set of changesets (the "source |
43 \"source branch\"). If you specify source (``-s/--source``), |
43 branch"). If you specify source (``-s/--source``), rebase will |
44 rebase will rebase that changeset and all of its descendants onto |
44 rebase that changeset and all of its descendants onto dest. If you |
45 dest. If you specify base (``-b/--base``), rebase will select |
45 specify base (``-b/--base``), rebase will select ancestors of base |
46 ancestors of base back to but not including the common ancestor |
46 back to but not including the common ancestor with dest. Thus, |
47 with dest. Thus, ``-b`` is less precise but more convenient than |
47 ``-b`` is less precise but more convenient than ``-s``: you can |
48 ``-s``: you can specify any changeset in the source branch, and |
48 specify any changeset in the source branch, and rebase will select |
49 rebase will select the whole branch. If you specify neither ``-s`` |
49 the whole branch. If you specify neither ``-s`` nor ``-b``, rebase |
50 nor ``-b``, rebase uses the parent of the working directory as the |
50 uses the parent of the working directory as the base. |
51 base. |
|
52 |
51 |
53 By default, rebase recreates the changesets in the source branch |
52 By default, rebase recreates the changesets in the source branch |
54 as descendants of dest and then destroys the originals. Use |
53 as descendants of dest and then destroys the originals. Use |
55 ``--keep`` to preserve the original source changesets. Some |
54 ``--keep`` to preserve the original source changesets. Some |
56 changesets in the source branch (e.g. merges from the destination |
55 changesets in the source branch (e.g. merges from the destination |