##// END OF EJS Templates
merge with stable
Yuya Nishihara -
r41983:169c386c merge default
parent child Browse files
Show More
@@ -767,7 +767,7 b' def rebase(ui, repo, **opts):'
767 3. Use ``--base`` to select a changeset; rebase will find ancestors
767 3. Use ``--base`` to select a changeset; rebase will find ancestors
768 and their descendants which are not also ancestors of the destination.
768 and their descendants which are not also ancestors of the destination.
769
769
770 4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
770 4. If you do not specify any of ``--rev``, ``--source``, or ``--base``,
771 rebase will use ``--base .`` as above.
771 rebase will use ``--base .`` as above.
772
772
773 If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC``
773 If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC``
General Comments 0
You need to be logged in to leave comments. Login now