From c1a834faa66f30e2d9d7f6554c4c900aae7ffaff Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Sun, 24 Jul 2016 14:18:30 +0200
Subject: [PATCH] gpb.conf added

---
 debian/gbp.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index b7a5f8f..ffe50a8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,7 @@
 debian-branch = debian/experimental
 upstream-branch = upstream/latest
 pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False