From 7a32e15c0e3065819356536320d48de4d9552b93 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 9 Apr 2024 15:35:53 +0200 Subject: Adding dpkg-mergechangelogs merge driver for debian/changelog files. Signed-off-by: Daniel Baumann --- debian/local/gitattributes | 3 +++ debian/local/gitconfig | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 debian/local/gitattributes (limited to 'debian/local') diff --git a/debian/local/gitattributes b/debian/local/gitattributes new file mode 100644 index 0000000..35a8b89 --- /dev/null +++ b/debian/local/gitattributes @@ -0,0 +1,3 @@ +# /etc/gitattributes + +debian/changelog merge=dpkg-mergechangelogs diff --git a/debian/local/gitconfig b/debian/local/gitconfig index a48fcf4..a62573f 100644 --- a/debian/local/gitconfig +++ b/debian/local/gitconfig @@ -22,3 +22,8 @@ [log] follow = true + +[merge "dpkg-mergechangelogs"] + # depends: dpkg-dev + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A -- cgit v1.2.3