diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-17 13:29:21 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-17 14:36:40 +0000 |
commit | 601f39bca09fa52acadec3b908f29aecc241e868 (patch) | |
tree | 04d527ce99b5636d2a0af80d541e1c281248b70a /morphlib | |
parent | a27295adbbffed095854cc17e5ea52b8ebffab6a (diff) | |
download | morph-601f39bca09fa52acadec3b908f29aecc241e868.tar.gz |
b&m: Use new-status as the default
The previous status is currently still available as old-status.
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 2 | ||||
-rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index ad1d4147..7710f309 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -53,7 +53,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): 'show-branch-root', self.show_branch_root, arg_synopsis='') self.app.add_subcommand('foreach', self.foreach, arg_synopsis='-- COMMAND [ARGS...]') - self.app.add_subcommand('new-status', self.status, + self.app.add_subcommand('status', self.status, arg_synopsis='') def disable(self): diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 671071b6..37d5e40c 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -67,7 +67,7 @@ class BranchAndMergePlugin(cliapp.Plugin): 'tag', self.tag, arg_synopsis='TAG-NAME -- [GIT-COMMIT-ARG...]') self.app.add_subcommand('build', self.build, arg_synopsis='SYSTEM') - self.app.add_subcommand('status', self.status) + self.app.add_subcommand('old-status', self.status) self.app.add_subcommand('branch-from-image', self.branch_from_image, arg_synopsis='REPO BRANCH') group_branch = 'Branching Options' |