From 318764142c9e5eeff0e063358f5da906b80b2310 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: Sat, 19 Mar 2016 14:04:38 +0800
Subject: [PATCH] Update gbp.conf

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

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