Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add short -k option for --keep
authorNat Mote <nmote@fb.com>
Tue, 12 May 2015 15:04:19 -0700
changeset 25025 72f7f98bc5e5
parent 25024 263bbed1833c
child 25026 80d28a88137f
rebase: add short -k option for --keep histedit and strip already have a short option for keep, so this makes the interface more consistent
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-scenario-global.t file | annotate | diff | comparison | revisions 
--- 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"
Mercurial