horok/git
1
0
Fork 0
Code Activity

Adding dpkg-mergechangelogs merge driver for debian/changelog files.

Browse source 
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
Daniel Baumann 2025-06-22 09:35:58 +02:00
parent 3b28ffa603
commit 69b77a976d
Signed by: daniel.baumann
GPG key ID: BCC918A2ABD66424
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/local/gitattributes vendored Normal file
View file

@ -0,0 +1,3 @@
# /etc/gitattributes
debian/changelog merge=dpkg-mergechangelogs

5
debian/local/gitconfig vendored
View file

@ -19,3 +19,8 @@
[log]
follow = true
[merge "dpkg-mergechangelogs"]
# depends: dpkg-dev
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A