Show More
@@ -67,7 +67,7 b' def _makeextrafn(copiers):' | |||
|
67 | 67 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
68 | 68 | ('l', 'logfile', '', |
|
69 | 69 | _('read collapse commit message from file'), _('FILE')), |
|
70 | ('', 'keep', False, _('keep original changesets')), | |
|
70 | ('k', 'keep', False, _('keep original changesets')), | |
|
71 | 71 | ('', 'keepbranches', False, _('keep original branch names')), |
|
72 | 72 | ('D', 'detach', False, _('(DEPRECATED)')), |
|
73 | 73 | ('i', 'interactive', False, _('(DEPRECATED)')), |
@@ -397,7 +397,7 b' Source on have two descendant heads but ' | |||
|
397 | 397 | abort: can't remove original changesets with unrebased descendants |
|
398 | 398 | (use --keep to keep original changesets) |
|
399 | 399 | [255] |
|
400 |
$ hg rebase -r '2::8' -d 1 |
|
|
400 | $ hg rebase -r '2::8' -d 1 -k | |
|
401 | 401 | rebasing 2:c9e50f6cdc55 "C" |
|
402 | 402 | rebasing 3:ffd453c31098 "D" |
|
403 | 403 | rebasing 6:3d8a618087a7 "G" |
General Comments 0
You need to be logged in to leave comments.
Login now