##// END OF EJS Templates
rebase: wrapped docstrings at 78 characters
Martin Geisler -
r9073:ec1cd317 default
parent child Browse files
Show More
@@ -7,8 +7,7 b''
7
7
8 '''command to move sets of revisions to a different ancestor
8 '''command to 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 repository.
11 repository.
12
11
13 For more information:
12 For more information:
14 http://mercurial.selenic.com/wiki/RebaseProject
13 http://mercurial.selenic.com/wiki/RebaseProject
@@ -42,9 +41,9 b' def rebasemerge(repo, rev, first=False):'
42 def rebase(ui, repo, **opts):
41 def rebase(ui, repo, **opts):
43 """move changeset (and descendants) to a different branch
42 """move changeset (and descendants) to a different branch
44
43
45 Rebase uses repeated merging to graft changesets from one part of
44 Rebase uses repeated merging to graft changesets from one part of history
46 history onto another. This can be useful for linearizing local
45 onto another. This can be useful for linearizing local changes relative to
47 changes relative to a master development tree.
46 a master development tree.
48
47
49 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
50 continued with --continue/-c or aborted with --abort/-a.
49 continued with --continue/-c or aborted with --abort/-a.
@@ -6,9 +6,9 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 history
10 history onto another. This can be useful for linearizing local
10 onto another. This can be useful for linearizing local changes relative to
11 changes relative to 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
13 If a rebase is interrupted to manually resolve a merge, it can be
14 continued with --continue/-c or aborted with --abort/-a.
14 continued with --continue/-c or aborted with --abort/-a.
@@ -34,9 +34,9 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 history
38 history onto another. This can be useful for linearizing local
38 onto another. This can be useful for linearizing local changes relative to
39 changes relative to 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
41 If a rebase is interrupted to manually resolve a merge, it can be
42 continued with --continue/-c or aborted with --abort/-a.
42 continued with --continue/-c or aborted with --abort/-a.
@@ -62,9 +62,9 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 history
66 history onto another. This can be useful for linearizing local
66 onto another. This can be useful for linearizing local changes relative to
67 changes relative to 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
69 If a rebase is interrupted to manually resolve a merge, it can be
70 continued with --continue/-c or aborted with --abort/-a.
70 continued with --continue/-c or aborted with --abort/-a.
@@ -90,9 +90,9 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 history
94 history onto another. This can be useful for linearizing local
94 onto another. This can be useful for linearizing local changes relative to
95 changes relative to 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
97 If a rebase is interrupted to manually resolve a merge, it can be
98 continued with --continue/-c or aborted with --abort/-a.
98 continued with --continue/-c or aborted with --abort/-a.
General Comments 0
You need to be logged in to leave comments. Login now