diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-25 21:21:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:36:29 +0100 |
| commit | 16dd3ffe595a585adc0fffb7f4ab97b29807911b (patch) | |
| tree | 2ab82c43f1ec78f1db0c4b80ef51a0caa68af682 /debian/changelog | |
| parent | 6a009a8fe0fa46c0d92d51300566c7afcf21ed2e (diff) | |
Overwrite: Document --overwrite=VERSION
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 7143fe7..625fedd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ dgit (1.5~~) unstable; urgency=medium in the toplevel the same way we treat ones in the toplevel. * When automatically generating quilt patch, honour GIT_COMMITTER_DATE for filename creation (makes filename deterministic in test suite). + * New --overwrite option, replaces need to for user to use + git merge -s ours. Closes:#838718. Infrastructure: * Better error handling in dgit-repos-policy-debian. |