diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-19 16:46:01 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-19 16:46:01 +0000 |
| commit | 22e2920326bc3b7d180e07b239efa0e40dc32e25 (patch) | |
| tree | 31c2150fc0e11f5b7fb9c4a466b6d366d5d50a48 /morphlib/app.py | |
| parent | 7558bdf7d5748e3d481227bbc46e04ca5f5b3f85 (diff) | |
| parent | 6a0bc4c29b2bd3bbbdf8e765da8dce8490e34ddd (diff) | |
| download | morph-22e2920326bc3b7d180e07b239efa0e40dc32e25.tar.gz | |
Merge branch 'sam/optional-temporary-build-branches'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Diffstat (limited to 'morphlib/app.py')
| -rw-r--r-- | morphlib/app.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 177bce45..0c87f814 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -139,6 +139,14 @@ class Morph(cliapp.Application): 'always push temporary build branches to the ' 'remote repository', group=group_build) + self.settings.choice (['local-changes'], + ['include', 'ignore'], + 'the `build` and `deploy` commands detect ' + 'uncommitted/unpushed local changes and operate ' + 'operate from a temporary branch containing ' + 'those changes. Disable this behaviour with the ' + '`ignore` setting.', + group=group_build) group_storage = 'Storage Options' self.settings.string(['tempdir'], |