Show More
@@ -733,7 +733,8 def rebase(ui, repo, **opts): | |||||
733 | deleted, there is no hook presently available for this. |
|
733 | deleted, there is no hook presently available for this. | |
734 |
|
734 | |||
735 | If a rebase is interrupted to manually resolve a conflict, it can be |
|
735 | If a rebase is interrupted to manually resolve a conflict, it can be | |
736 |
continued with --continue/-c |
|
736 | continued with --continue/-c, aborted with --abort/-a, or stopped with | |
|
737 | --stop. | |||
737 |
|
738 | |||
738 | .. container:: verbose |
|
739 | .. container:: verbose | |
739 |
|
740 |
General Comments 0
You need to be logged in to leave comments.
Login now