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.conf | |
| parent | ec27521aea1bd3f11104a09457ce4df7bb23019d (diff) | |
| download | git-buildpackage-b9aae056a67031db81376891c57663803e990ddc.tar.gz git-buildpackage-b9aae056a67031db81376891c57663803e990ddc.tar.bz2 git-buildpackage-b9aae056a67031db81376891c57663803e990ddc.zip | |
Make --[no-]merge a proper option
so it can be configured via gbp.conf.
Diffstat (limited to 'gbp.conf')
| -rw-r--r-- | gbp.conf | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -46,15 +46,17 @@ # Options only affecting git-import-orig [git-import-orig] -# set a different upstream branches to import to: +# set a different upstream branch to import to: #upstream-branch = newupstream # set a different branch to merge to: #debian-branch = dfsgclean +# don't merge to debian branch by default: +#merge = False # import filter: #filter = .svn # filter out files from tarball passed to pristine tar: #filter-pristine-tar = True -# hook run after the import: +# run hook after the import: #postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH # emulate old behaviour of calling dch: #postimport = dch -v%(version)s New Upstream Version |