Update gbp.conf

9 years ago · 557d261df0
parent 5d01775fec
commit 557d261df0
1 changed files with 6 additions and 0 deletions
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,2 +1,8 @@
 [DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
 pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False