Revert "Update gbp.conf"
This reverts commit 0dbe8613b4f83d0a19e256824d0b1540b40dd85c.
This commit is contained in:
parent
9b0280224a
commit
61a063b199
4
debian/gbp.conf
vendored
4
debian/gbp.conf
vendored
@ -2,3 +2,7 @@
|
|||||||
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