diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-01-10 15:17:21 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-01-11 06:46:03 +0100 |
| commit | b9aae056a67031db81376891c57663803e990ddc (patch) | |
| tree | 9f4da0d1f981cfb1b22126ad2be4296c7bbe9f5f /gbp | |
| parent | ec27521aea1bd3f11104a09457ce4df7bb23019d (diff) | |
Make --[no-]merge a proper option
so it can be configured via gbp.conf.
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py index 8448762c..51dc7e68 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -95,6 +95,7 @@ class GbpOptionParser(OptionParser): 'spawn-editor' : 'release', 'patch-numbers' : 'True', 'notify' : 'auto', + 'merge' : 'True', } help = { 'debian-branch': @@ -151,6 +152,8 @@ class GbpOptionParser(OptionParser): "Whether to number patch files, default is %(patch-numbers)s", 'notify': "Whether to send a desktop notification after the build, default is '%(notify)s'", + 'merge': + "after the import merge the result to the debian branch, default is '%(merge)s'", } config_files = [ '/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), |