diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-04-04 07:13:15 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-04-12 11:19:09 +0200 |
| commit | e890ce326ee66e0339ae4c83644473173fc4758e (patch) | |
| tree | 9eeddd3c212c0b1c1af1ee894363ba973bf10e9a /debian/NEWS | |
| parent | 7cfe71d6d45399ded9b50209a2c0dcbf132afd3d (diff) | |
ipmort_orig: pick best way to import upstream tarball automatically
Add new value --merge-mode=auto that selects either 'replace' or
'merge' depending on the source format version.
Closes: #700411
Diffstat (limited to 'debian/NEWS')
| -rw-r--r-- | debian/NEWS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS index 03c08ce2..63f38294 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,11 @@ +git-buildpackage (0.8.14) unstable; urgency=medium + + gbp import-orig's --merge-mode option now defaults to 'auto' selecting + 'replace' for 3.0 (quilt) packages and 'merge' otherwise. If you want to + retain the old behaviour of 'merge' please do so in gbp.conf. + + -- Guido Günther <agx@sigxcpu.org> Tue, 04 Apr 2017 07:20:04 +0200 + git-buildpackage (0.6.26) unstable; urgency=medium All gbp-* and git-* commands are now gone as announced in the |