Skip to content
Snippets Groups Projects
Commit f2558a8228be authored by Stefano Tortarolo's avatar Stefano Tortarolo
Browse files

rebase: add option to not commit after a collapsing

This option is useful when other extensions (e.g., pbranch) want to
use rebase --collapse and append other things before committing.
This is not intended to be used from command line.
parent 13341047d517
No related branches found
No related tags found
No related merge requests found
......@@ -87,6 +87,9 @@
keepf = opts.get('keep', False)
keepbranchesf = opts.get('keepbranches', False)
detachf = opts.get('detach', False)
# keepopen is not meant for use on the command line, but by
# other extensions
keepopen = opts.get('keepopen', False)
if contf or abortf:
if contf and abortf:
......@@ -181,7 +184,7 @@
ui.note(_('rebase merging completed\n'))
if collapsef:
if collapsef and not keepopen:
p1, p2 = defineparents(repo, min(state), target,
state, targetancestors)
commitmsg = 'Collapsed revision'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment