From 1080680d218d0591ef2e14fc3be024103944014d Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 21 Mar 2016 18:21:23 +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