summaryrefslogtreecommitdiffstats
path: root/debian/git.install
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/git.install
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/git.install')
-rwxr-xr-xdebian/git.install1
1 files changed, 1 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