Update gbp.conf

9 years ago · 38cb4bf947
parent 807163a9e9
commit 38cb4bf947
1 changed files with 8 additions and 0 deletions
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,2 +1,10 @@
+[DEFAULT]
+debian-branch = debian
+pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False
+
 [buildpackage]
 compression = xz