summaryrefslogtreecommitdiff
path: root/debian/gbp.conf
diff options
context:
space:
mode:
authorBernhard Schmidt <berni@debian.org>2020-09-01 16:52:17 +0200
committerBernhard Schmidt <berni@debian.org>2020-09-01 16:52:17 +0200
commit9fc3b98112217f2d92a67977dbde0987cc7a1803 (patch)
tree29fcc8654ee65d9dd89ade797bea2f3d9dfd9cfd /debian/gbp.conf
parenta8758c0e03eed188dcb9da0e4fd781a67c25bf1e (diff)
parent69b02b1f7fd609d84ace13ab04697158de2418a9 (diff)
Merge branch 'debian/experimental-2.5'
Diffstat (limited to 'debian/gbp.conf')
-rw-r--r--debian/gbp.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..1526270 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,5 @@
[DEFAULT]
pristine-tar = True
+
+debian-branch = debian/experimental-2.5
+upstream-branch = upstream-2.5