Show More
@@ -138,7 +138,7 b' def rebase(ui, repo, **opts):' | |||||
138 | skipped = set() |
|
138 | skipped = set() | |
139 | targetancestors = set() |
|
139 | targetancestors = set() | |
140 |
|
140 | |||
141 | editor = cmdutil.getcommiteditor(**opts) |
|
141 | editor = cmdutil.getcommiteditor(editform='rebase.normal', **opts) | |
142 |
|
142 | |||
143 | lock = wlock = None |
|
143 | lock = wlock = None | |
144 | try: |
|
144 | try: | |
@@ -383,7 +383,8 b' def rebase(ui, repo, **opts):' | |||||
383 | for rebased in state: |
|
383 | for rebased in state: | |
384 | if rebased not in skipped and state[rebased] > nullmerge: |
|
384 | if rebased not in skipped and state[rebased] > nullmerge: | |
385 | commitmsg += '\n* %s' % repo[rebased].description() |
|
385 | commitmsg += '\n* %s' % repo[rebased].description() | |
386 | editor = cmdutil.getcommiteditor(edit=True) |
|
386 | editform = 'rebase.collapse' | |
|
387 | editor = cmdutil.getcommiteditor(edit=True, editform=editform) | |||
387 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, |
|
388 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | |
388 | extrafn=extrafn, editor=editor) |
|
389 | extrafn=extrafn, editor=editor) | |
389 | for oldrev in state.iterkeys(): |
|
390 | for oldrev in state.iterkeys(): |
General Comments 0
You need to be logged in to leave comments.
Login now