This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3970

rebase: include --stop option in documentation
ClosedPublic

Authored by khanchi97 on Jul 22 2018, 12:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG571361e47137: rebase: include --stop option in documentation
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jul 22 2018, 12:55 PM
khanchi97 updated this revision to Diff 9656.Jul 24 2018, 2:04 PM
khanchi97 updated this revision to Diff 10288.Aug 10 2018, 7:15 AM
yuja added a subscriber: yuja.Aug 14 2018, 8:47 PM
  • continued with --continue/-c or aborted with --abort/-a.

+ continued with --continue/-c or aborted with --abort/-a or stopped
+ with --stop.

I've adjusted it as "..., ..., or stopped with --stop."

Closed by commit rHG571361e47137: rebase: include --stop option in documentation (authored by khanchi97). · Explain WhyAug 14 2018, 8:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (3 lines)

Diff 10356

hgext/rebase.py

and/or destination. and/or destination.
If you need to use a tool to automate merge/conflict decisions, you If you need to use a tool to automate merge/conflict decisions, you
can specify one with ``--tool``, see :hg:`help merge-tools`. can specify one with ``--tool``, see :hg:`help merge-tools`.
As a caveat: the tool will not be used to mediate when a file was As a caveat: the tool will not be used to mediate when a file was
deleted, there is no hook presently available for this. deleted, there is no hook presently available for this.
If a rebase is interrupted to manually resolve a conflict, it can be If a rebase is interrupted to manually resolve a conflict, it can be
continued with --continue/-c or aborted with --abort/-a. continued with --continue/-c, aborted with --abort/-a, or stopped with
--stop.
.. container:: verbose .. container:: verbose
Examples: Examples:
- move "local changes" (current commit back to branching point) - move "local changes" (current commit back to branching point)
to the current branch tip after a pull:: to the current branch tip after a pull::