Show More
@@ -7,7 +7,8 b'' | |||||
7 |
|
7 | |||
8 | '''move sets of revisions to a different ancestor |
|
8 | '''move sets of revisions to a different ancestor | |
9 |
|
9 | |||
10 |
This extension lets you rebase changesets in an existing Mercurial |
|
10 | This extension lets you rebase changesets in an existing Mercurial | |
|
11 | repository. | |||
11 |
|
12 | |||
12 | For more information: |
|
13 | For more information: | |
13 | http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject |
|
14 | http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject | |
@@ -40,12 +41,12 b' def rebasemerge(repo, rev, first=False):' | |||||
40 | def rebase(ui, repo, **opts): |
|
41 | def rebase(ui, repo, **opts): | |
41 | """move changeset (and descendants) to a different branch |
|
42 | """move changeset (and descendants) to a different branch | |
42 |
|
43 | |||
43 |
Rebase uses repeated merging to graft changesets from one part of |
|
44 | Rebase uses repeated merging to graft changesets from one part of | |
44 |
onto another. This can be useful for linearizing local |
|
45 | history onto another. This can be useful for linearizing local | |
45 | a master development tree. |
|
46 | changes relative to a master development tree. | |
46 |
|
47 | |||
47 |
If a rebase is interrupted to manually resolve a merge, it can be |
|
48 | If a rebase is interrupted to manually resolve a merge, it can be | |
48 | with --continue or aborted with --abort. |
|
49 | continued with --continue or aborted with --abort. | |
49 | """ |
|
50 | """ | |
50 | originalwd = target = None |
|
51 | originalwd = target = None | |
51 | external = nullrev |
|
52 | external = nullrev |
@@ -6,12 +6,12 b' hg rebase [-s rev | -b rev] [-d rev] [--' | |||||
6 |
|
6 | |||
7 | move changeset (and descendants) to a different branch |
|
7 | move changeset (and descendants) to a different branch | |
8 |
|
8 | |||
9 |
Rebase uses repeated merging to graft changesets from one part of |
|
9 | Rebase uses repeated merging to graft changesets from one part of | |
10 |
onto another. This can be useful for linearizing local |
|
10 | history onto another. This can be useful for linearizing local | |
11 | a master development tree. |
|
11 | changes relative to a master development tree. | |
12 |
|
12 | |||
13 |
If a rebase is interrupted to manually resolve a merge, it can be |
|
13 | If a rebase is interrupted to manually resolve a merge, it can be | |
14 | with --continue or aborted with --abort. |
|
14 | continued with --continue or aborted with --abort. | |
15 |
|
15 | |||
16 | options: |
|
16 | options: | |
17 |
|
17 | |||
@@ -34,12 +34,12 b' hg rebase [-s rev | -b rev] [-d rev] [--' | |||||
34 |
|
34 | |||
35 | move changeset (and descendants) to a different branch |
|
35 | move changeset (and descendants) to a different branch | |
36 |
|
36 | |||
37 |
Rebase uses repeated merging to graft changesets from one part of |
|
37 | Rebase uses repeated merging to graft changesets from one part of | |
38 |
onto another. This can be useful for linearizing local |
|
38 | history onto another. This can be useful for linearizing local | |
39 | a master development tree. |
|
39 | changes relative to a master development tree. | |
40 |
|
40 | |||
41 |
If a rebase is interrupted to manually resolve a merge, it can be |
|
41 | If a rebase is interrupted to manually resolve a merge, it can be | |
42 | with --continue or aborted with --abort. |
|
42 | continued with --continue or aborted with --abort. | |
43 |
|
43 | |||
44 | options: |
|
44 | options: | |
45 |
|
45 | |||
@@ -62,12 +62,12 b' hg rebase [-s rev | -b rev] [-d rev] [--' | |||||
62 |
|
62 | |||
63 | move changeset (and descendants) to a different branch |
|
63 | move changeset (and descendants) to a different branch | |
64 |
|
64 | |||
65 |
Rebase uses repeated merging to graft changesets from one part of |
|
65 | Rebase uses repeated merging to graft changesets from one part of | |
66 |
onto another. This can be useful for linearizing local |
|
66 | history onto another. This can be useful for linearizing local | |
67 | a master development tree. |
|
67 | changes relative to a master development tree. | |
68 |
|
68 | |||
69 |
If a rebase is interrupted to manually resolve a merge, it can be |
|
69 | If a rebase is interrupted to manually resolve a merge, it can be | |
70 | with --continue or aborted with --abort. |
|
70 | continued with --continue or aborted with --abort. | |
71 |
|
71 | |||
72 | options: |
|
72 | options: | |
73 |
|
73 | |||
@@ -90,12 +90,12 b' hg rebase [-s rev | -b rev] [-d rev] [--' | |||||
90 |
|
90 | |||
91 | move changeset (and descendants) to a different branch |
|
91 | move changeset (and descendants) to a different branch | |
92 |
|
92 | |||
93 |
Rebase uses repeated merging to graft changesets from one part of |
|
93 | Rebase uses repeated merging to graft changesets from one part of | |
94 |
onto another. This can be useful for linearizing local |
|
94 | history onto another. This can be useful for linearizing local | |
95 | a master development tree. |
|
95 | changes relative to a master development tree. | |
96 |
|
96 | |||
97 |
If a rebase is interrupted to manually resolve a merge, it can be |
|
97 | If a rebase is interrupted to manually resolve a merge, it can be | |
98 | with --continue or aborted with --abort. |
|
98 | continued with --continue or aborted with --abort. | |
99 |
|
99 | |||
100 | options: |
|
100 | options: | |
101 |
|
101 |
General Comments 0
You need to be logged in to leave comments.
Login now