summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-09 13:35:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-09 13:35:53 +0000
commit7a32e15c0e3065819356536320d48de4d9552b93 (patch)
tree107feb02539a2f95bed8c5e28040249fd4815c41 /debian
parentSetting log.follow to true. (diff)
downloadgit-7a32e15c0e3065819356536320d48de4d9552b93.tar.xz
git-7a32e15c0e3065819356536320d48de4d9552b93.zip
Adding dpkg-mergechangelogs merge driver for debian/changelog files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/git.install1
-rw-r--r--debian/local/gitattributes3
-rw-r--r--debian/local/gitconfig5
3 files changed, 9 insertions, 0 deletions
diff --git a/debian/git.install b/debian/git.install
index 1eaf6aa..dcc9566 100755
--- a/debian/git.install
+++ b/debian/git.install
@@ -4,3 +4,4 @@ contrib/completion/git-prompt.sh => usr/lib/git-core/git-sh-prompt
debian/git-prompt.completion => etc/bash_completion.d/git-prompt
contrib/hooks usr/share/git-core/contrib
debian/local/gitconfig => /etc/gitconfig
+debian/local/gitattributes => /etc/gitattributes
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