Update gbp.conf

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