2014-09-02 14:27:35 +08:00
|
|
|
[DEFAULT]
|
2015-11-15 21:10:56 +08:00
|
|
|
debian-branch = debian/sid
|
|
|
|
|
upstream-branch = upstream/latest
|
2014-09-02 14:27:35 +08:00
|
|
|
pristine-tar = True
|
2015-11-15 21:10:56 +08:00
|
|
|
|
|
|
|
|
[import-orig]
|
|
|
|
|
# Use git cherrypick -n upstream instead.
|
|
|
|
|
merge = False
|
