Make --[no-]merge a proper option

so it can be configured via gbp.conf.

1 files changed, 4 insertions, 2 deletions

diff --git a/gbp.conf b/gbp.conf
index 9ab40932..941d4417 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