Update gbp.conf
This commit is contained in:
parent
a818072d84
commit
0dbe8613b4
4
debian/gbp.conf
vendored
4
debian/gbp.conf
vendored
@ -2,7 +2,3 @@
|
|||||||
debian-branch = debian/sid
|
debian-branch = debian/sid
|
||||||
upstream-branch = upstream/latest
|
upstream-branch = upstream/latest
|
||||||
pristine-tar = True
|
pristine-tar = True
|
||||||
|
|
||||||
[import-orig]
|
|
||||||
# Use git cherrypick -n upstream instead.
|
|
||||||
merge = False
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user