1 files changed, 5 insertions, 0 deletions
diff --git a/be b/be
index 2e038a5..ab6ddeb 100755
--- a/be
+++ b/be
@@ -27,6 +27,8 @@ if len(sys.argv) == 1 or sys.argv[1] in ('--help', '-h'):
 elif sys.argv[1] == '--commands':
     for command, module in cmdutil.iter_commands():
         print command
+elif sys.argv[1] == '--options':
+    print '\n'.join(cmdutil.options())
 else:
     try:
         try:
@@ -36,6 +38,9 @@ else:
         except cmdutil.GetHelp:
             print cmdutil.help(sys.argv[1])
             sys.exit(0)
+        except cmdutil.GetCompletions, e:
+            print '\n'.join(e.completions)
+            sys.exit(0)
         except cmdutil.UsageError, e:
             print "Invalid usage:", e
             print "\nArgs:", sys.argv[1:]