Update gbp.conf

8 years ago · 318764142c
parent d71a447819
commit 318764142c
1 changed files with 4 additions and 0 deletions
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -2,3 +2,7 @@
 debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False