From 4832ea386401eba890f9ca47858d891b7bc03b3d 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 11:23:05 +0800
Subject: [PATCH] Add gbp.conf

---
 debian/gbp.conf | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 debian/gbp.conf

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