[libhtml-mason-perl] 01/02: Add debian/gbp.conf to tell gbp import-orig to merge the upstream branch

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libhtml-mason-perl.

commit 55bda43e7762a2190c48f9bfd3dd5836a4b6a886
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jun 19 19:03:54 2017 +0200

    Add debian/gbp.conf to tell gbp import-orig to merge the upstream branch
    
    instead of replacing it, which is the new default.
    This is needed as we use git-debcherry in this package.
---
 debian/gbp.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6c88b1f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[import-orig]
+merge-mode=merge
+rollback=False

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-mason-perl.git