Mercurial > hg-stable

comparison tests/test-rebase-parameters.out @ 8076:5ec526c1a32f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help texts: write command line switches as -a/--abc
author Martin Geisler <mg@lazybytes.net>
date Sat, 18 Apr 2009 14:40:21 +0200
parents 813a02a4eda2
children ec1cd3176625 fdf0c375cdbf
comparison
equal deleted inserted replaced
8075:1f0a5a5fff43 8076:5ec526c1a32f
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 history onto another. This can be useful for linearizing local 10 history onto another. This can be useful for linearizing local
11 changes relative to 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 continued with --continue or aborted with --abort. 14 continued with --continue/-c or aborted with --abort/-a.
15 15
16 options: 16 options:
17 17
18 -s --source rebase from a given revision 18 -s --source rebase from a given revision
19 -b --base rebase from the base of a given revision 19 -b --base rebase from the base of a given revision
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 history onto another. This can be useful for linearizing local 38 history onto another. This can be useful for linearizing local
39 changes relative to 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 continued with --continue or aborted with --abort. 42 continued with --continue/-c or aborted with --abort/-a.
43 43
44 options: 44 options:
45 45
46 -s --source rebase from a given revision 46 -s --source rebase from a given revision
47 -b --base rebase from the base of a given revision 47 -b --base rebase from the base of a given revision
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 history onto another. This can be useful for linearizing local 66 history onto another. This can be useful for linearizing local
67 changes relative to 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 continued with --continue or aborted with --abort. 70 continued with --continue/-c or aborted with --abort/-a.
71 71
72 options: 72 options:
73 73
74 -s --source rebase from a given revision 74 -s --source rebase from a given revision
75 -b --base rebase from the base of a given revision 75 -b --base rebase from the base of a given revision
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 history onto another. This can be useful for linearizing local 94 history onto another. This can be useful for linearizing local
95 changes relative to 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 continued with --continue or aborted with --abort. 98 continued with --continue/-c or aborted with --abort/-a.
99 99
100 options: 100 options:
101 101
102 -s --source rebase from a given revision 102 -s --source rebase from a given revision
103 -b --base rebase from the base of a given revision 103 -b --base rebase from the base of a given revision