Mercurial > hg
changeset 27457:97cc045f1cfe
rebase: simplify documentation about heads
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Fri, 18 Dec 2015 18:31:45 +0000 |
| parents | 2337958596e3 |
| children | d39e743e3578 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Dec 18 18:22:03 2015 +0000 +++ b/hgext/rebase.py Fri Dec 18 18:31:45 2015 +0000 @@ -134,12 +134,9 @@ Some changesets may be dropped if they do not contribute changes (e.g. merges from the destination branch). - One result of the rules for selecting the destination changeset - and source branch is that, unlike ``merge``, rebase will do - nothing if you are at the branch tip of a named branch - with two heads. You need to explicitly specify source and/or - destination (or ``update`` to the other head, if it's the head of - the intended source branch). + Unlike ``merge``, rebase will do nothing if you are at the branch tip of + a named branch with two heads. You will need to explicitly specify source + and/or destination. If a rebase is interrupted to manually resolve a merge, it can be continued with --continue/-c or aborted with --abort/-a.