diff options
Diffstat (limited to 'debian')
-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. |