From b9aae056a67031db81376891c57663803e990ddc Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 10 Jan 2011 15:17:21 +0100 Subject: Make --[no-]merge a proper option so it can be configured via gbp.conf. --- gbp.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gbp.conf') diff --git a/gbp.conf b/gbp.conf index 9ab4093..941d441 100644 --- a/gbp.conf +++ b/gbp.conf @@ -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 -- cgit v1.2.3