2015-10-15 11:23:05 +08:00
|
|
|
[DEFAULT]
|
2015-11-15 20:20:56 +08:00
|
|
|
debian-branch = debian/sid
|
|
|
|
|
upstream-branch = upstream/latest
|
2015-10-15 11:23:05 +08:00
|
|
|
pristine-tar = True
|
2015-11-15 20:24:24 +08:00
|
|
|
|
|
|
|
|
[import-orig]
|
|
|
|
|
# Use git cherrypick -n upstream instead.
|
|
|
|
|
merge = False
|
