From 659e2945e560f262083abea4740c796ec83993ea 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, 22 Oct 2015 09:21:03 +0800
Subject: [PATCH] Update gbp.conf

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

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