Mercurial > hg-stable
changeset 25025:72f7f98bc5e5
rebase: add short -k option for --keep
histedit and strip already have a short option for keep, so this makes the
interface more consistent
| author | Nat Mote <nmote@fb.com> |
|---|---|
| date | Tue, 12 May 2015 15:04:19 -0700 |
| parents | 263bbed1833c |
| children | 80d28a88137f |
| files | hgext/rebase.py tests/test-rebase-scenario-global.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Mar 30 19:51:40 2015 +0900 +++ b/hgext/rebase.py Tue May 12 15:04:19 2015 -0700 @@ -67,7 +67,7 @@ ('e', 'edit', False, _('invoke editor on commit messages')), ('l', 'logfile', '', _('read collapse commit message from file'), _('FILE')), - ('', 'keep', False, _('keep original changesets')), + ('k', 'keep', False, _('keep original changesets')), ('', 'keepbranches', False, _('keep original branch names')), ('D', 'detach', False, _('(DEPRECATED)')), ('i', 'interactive', False, _('(DEPRECATED)')),
--- a/tests/test-rebase-scenario-global.t Mon Mar 30 19:51:40 2015 +0900 +++ b/tests/test-rebase-scenario-global.t Tue May 12 15:04:19 2015 -0700 @@ -397,7 +397,7 @@ abort: can't remove original changesets with unrebased descendants (use --keep to keep original changesets) [255] - $ hg rebase -r '2::8' -d 1 --keep + $ hg rebase -r '2::8' -d 1 -k rebasing 2:c9e50f6cdc55 "C" rebasing 3:ffd453c31098 "D" rebasing 6:3d8a618087a7 "G"