From 7005e8311b2b6920c9cddb25e36769280d6a5095 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?= Date: Wed, 11 Nov 2015 22:26:08 +0800 Subject: [PATCH] Add gbp.conf --- debian/gbp.conf | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..7a9f00a --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False