diff -r 3e92322d3b1f -r f94442d46984 hgext/uncommit.py
--- a/hgext/uncommit.py	Mon Sep 18 14:19:47 2017 -0400
+++ b/hgext/uncommit.py	Sat Sep 16 02:34:13 2017 +0530
@@ -133,7 +133,7 @@
         ds.copy(src, dst)
 
 @command('uncommit',
-    [('', 'empty', False, _('allow an empty commit after uncommiting')),
+    [('', 'keep', False, _('allow an empty commit after uncommiting')),
     ] + commands.walkopts,
     _('[OPTION]... [FILE]...'))
 def uncommit(ui, repo, *pats, **opts):
@@ -163,7 +163,7 @@
 
         with repo.transaction('uncommit'):
             match = scmutil.match(old, pats, opts)
-            newid = _commitfiltered(repo, old, match, opts.get('empty'))
+            newid = _commitfiltered(repo, old, match, opts.get('keep'))
             if newid is None:
                 ui.status(_("nothing to uncommit\n"))
                 return 1