2015-12-17 18:48:49 +01:00
|
|
|
[DEFAULT]
|
2015-12-18 23:47:03 +08:00
|
|
|
debian-branch = debian/sid
|
|
|
|
|
upstream-branch = upstream/latest
|
2015-12-17 18:48:49 +01:00
|
|
|
pristine-tar = True
|
2016-03-31 19:41:24 +02:00
|
|
|
|
|
|
|
|
[import-orig]
|
|
|
|
|
# Use git cherrypick -n upstream instead.
|
|
|
|
|
merge = False
|
