1 % These fail |
1 % These fail |
2 |
2 |
3 % Use continue and abort |
3 % Use continue and abort |
4 hg rebase: cannot use both abort and continue |
4 hg rebase: cannot use both abort and continue |
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] |
5 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
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 history |
9 Rebase uses repeated merging to graft changesets from one part of history |
10 onto another. This can be useful for linearizing local changes relative to |
10 onto another. This can be useful for linearizing local changes relative to |
11 a master development tree. |
11 a master development tree. |
12 |
12 |
13 If a rebase is interrupted to manually resolve a merge, it can be continued |
13 If a rebase is interrupted to manually resolve a merge, it can be continued |
14 with --continue or aborted with --abort. |
14 with --continue or aborted with --abort. |
15 |
15 |
16 options: |
16 options: |
17 |
17 |
18 --keep keep original revisions |
18 -s --source rebase from a given revision |
19 --keepbranches keep original branches |
19 -b --base rebase from the base of a given revision |
20 -s --source rebase from a given revision |
20 -d --dest rebase onto a given revision |
21 -b --base rebase from the base of a given revision |
21 --collapse collapse the rebased revisions |
22 -d --dest rebase onto a given revision |
22 --keep keep original revisions |
23 --collapse collapse the rebased revisions |
23 --keepbranches keep original branches |
24 -c --continue continue an interrupted rebase |
24 -c --continue continue an interrupted rebase |
25 -a --abort abort an interrupted rebase |
25 -a --abort abort an interrupted rebase |
26 --style display using template map file |
26 --style display using template map file |
27 --template display with template |
27 --template display with template |
28 |
28 |
29 use "hg -v help rebase" to show global options |
29 use "hg -v help rebase" to show global options |
30 |
30 |
31 % Use continue and collapse |
31 % Use continue and collapse |
32 hg rebase: cannot use collapse with continue or abort |
32 hg rebase: cannot use collapse with continue or abort |
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] |
33 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
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 history |
37 Rebase uses repeated merging to graft changesets from one part of history |
38 onto another. This can be useful for linearizing local changes relative to |
38 onto another. This can be useful for linearizing local changes relative to |
39 a master development tree. |
39 a master development tree. |
40 |
40 |
41 If a rebase is interrupted to manually resolve a merge, it can be continued |
41 If a rebase is interrupted to manually resolve a merge, it can be continued |
42 with --continue or aborted with --abort. |
42 with --continue or aborted with --abort. |
43 |
43 |
44 options: |
44 options: |
45 |
45 |
46 --keep keep original revisions |
46 -s --source rebase from a given revision |
47 --keepbranches keep original branches |
47 -b --base rebase from the base of a given revision |
48 -s --source rebase from a given revision |
48 -d --dest rebase onto a given revision |
49 -b --base rebase from the base of a given revision |
49 --collapse collapse the rebased revisions |
50 -d --dest rebase onto a given revision |
50 --keep keep original revisions |
51 --collapse collapse the rebased revisions |
51 --keepbranches keep original branches |
52 -c --continue continue an interrupted rebase |
52 -c --continue continue an interrupted rebase |
53 -a --abort abort an interrupted rebase |
53 -a --abort abort an interrupted rebase |
54 --style display using template map file |
54 --style display using template map file |
55 --template display with template |
55 --template display with template |
56 |
56 |
57 use "hg -v help rebase" to show global options |
57 use "hg -v help rebase" to show global options |
58 |
58 |
59 % Use continue/abort and dest/source |
59 % Use continue/abort and dest/source |
60 hg rebase: abort and continue do not allow specifying revisions |
60 hg rebase: abort and continue do not allow specifying revisions |
61 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] |
61 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
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 history |
65 Rebase uses repeated merging to graft changesets from one part of history |
66 onto another. This can be useful for linearizing local changes relative to |
66 onto another. This can be useful for linearizing local changes relative to |
67 a master development tree. |
67 a master development tree. |
68 |
68 |
69 If a rebase is interrupted to manually resolve a merge, it can be continued |
69 If a rebase is interrupted to manually resolve a merge, it can be continued |
70 with --continue or aborted with --abort. |
70 with --continue or aborted with --abort. |
71 |
71 |
72 options: |
72 options: |
73 |
73 |
74 --keep keep original revisions |
74 -s --source rebase from a given revision |
75 --keepbranches keep original branches |
75 -b --base rebase from the base of a given revision |
76 -s --source rebase from a given revision |
76 -d --dest rebase onto a given revision |
77 -b --base rebase from the base of a given revision |
77 --collapse collapse the rebased revisions |
78 -d --dest rebase onto a given revision |
78 --keep keep original revisions |
79 --collapse collapse the rebased revisions |
79 --keepbranches keep original branches |
80 -c --continue continue an interrupted rebase |
80 -c --continue continue an interrupted rebase |
81 -a --abort abort an interrupted rebase |
81 -a --abort abort an interrupted rebase |
82 --style display using template map file |
82 --style display using template map file |
83 --template display with template |
83 --template display with template |
84 |
84 |
85 use "hg -v help rebase" to show global options |
85 use "hg -v help rebase" to show global options |
86 |
86 |
87 % Use source and base |
87 % Use source and base |
88 hg rebase: cannot specify both a revision and a base |
88 hg rebase: cannot specify both a revision and a base |
89 hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] |
89 hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] |
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 history |
93 Rebase uses repeated merging to graft changesets from one part of history |
94 onto another. This can be useful for linearizing local changes relative to |
94 onto another. This can be useful for linearizing local changes relative to |
95 a master development tree. |
95 a master development tree. |
96 |
96 |
97 If a rebase is interrupted to manually resolve a merge, it can be continued |
97 If a rebase is interrupted to manually resolve a merge, it can be continued |
98 with --continue or aborted with --abort. |
98 with --continue or aborted with --abort. |
99 |
99 |
100 options: |
100 options: |
101 |
101 |
102 --keep keep original revisions |
102 -s --source rebase from a given revision |
103 --keepbranches keep original branches |
103 -b --base rebase from the base of a given revision |
104 -s --source rebase from a given revision |
104 -d --dest rebase onto a given revision |
105 -b --base rebase from the base of a given revision |
105 --collapse collapse the rebased revisions |
106 -d --dest rebase onto a given revision |
106 --keep keep original revisions |
107 --collapse collapse the rebased revisions |
107 --keepbranches keep original branches |
108 -c --continue continue an interrupted rebase |
108 -c --continue continue an interrupted rebase |
109 -a --abort abort an interrupted rebase |
109 -a --abort abort an interrupted rebase |
110 --style display using template map file |
110 --style display using template map file |
111 --template display with template |
111 --template display with template |
112 |
112 |