Revert "Update gbp.conf"

This reverts commit 0dbe8613b4.
9 years ago · 61a063b199
parent 9b0280224a
commit 61a063b199
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