Show More
@@ -52,6 +52,7 b' testpats = [' | |||||
52 | (r'/bin/', "don't use explicit paths for tools"), |
|
52 | (r'/bin/', "don't use explicit paths for tools"), | |
53 | (r'\$PWD', "don't use $PWD, use `pwd`"), |
|
53 | (r'\$PWD', "don't use $PWD, use `pwd`"), | |
54 | (r'[^\n]\Z', "no trailing newline"), |
|
54 | (r'[^\n]\Z', "no trailing newline"), | |
|
55 | (r'export.*=', "don't export and assign at once"), | |||
55 | ] |
|
56 | ] | |
56 |
|
57 | |||
57 | testfilters = [ |
|
58 | testfilters = [ |
@@ -38,17 +38,16 b' def rebase(ui, repo, **opts):' | |||||
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 |
|
|
41 | "source" changeset or as a "base" changeset. Both are shorthand | |
42 |
|
|
42 | for a topologically related set of changesets (the "source | |
43 |
|
|
43 | branch"). If you specify source (``-s/--source``), rebase will | |
44 |
rebase |
|
44 | rebase that changeset and all of its descendants onto dest. If you | |
45 |
|
|
45 | specify base (``-b/--base``), rebase will select ancestors of base | |
46 |
|
|
46 | back to but not including the common ancestor with dest. Thus, | |
47 |
|
|
47 | ``-b`` is less precise but more convenient than ``-s``: you can | |
48 |
|
|
48 | specify any changeset in the source branch, and rebase will select | |
49 |
|
|
49 | the whole branch. If you specify neither ``-s`` nor ``-b``, rebase | |
50 |
|
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now