From 38cb4bf9470b05386e72ca3a9d7bd3c617882e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?=
 <czchen@debian.org>
Date: Thu, 15 Oct 2015 09:31:06 +0800
Subject: [PATCH] Update gbp.conf

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

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 75d8e9d..7b2cc90 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,10 @@
+[DEFAULT]
+debian-branch = debian
+pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False
+
 [buildpackage]
 compression = xz