diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:54:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:54:20 +0000 |
| commit | 1b7ab5c655939a39c00d4b0a125e5d687304f9fb (patch) | |
| tree | 6c4f2a65e1f7ef55de3d75df7188b45125c77fae | |
| parent | Setting log.follow to true. (diff) | |
| download | git-1b7ab5c655939a39c00d4b0a125e5d687304f9fb.tar.xz git-1b7ab5c655939a39c00d4b0a125e5d687304f9fb.zip | |
Adding dpkg-mergechangelogs merge driver for debian/changelog files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rwxr-xr-x | debian/git.install | 1 | ||||
| -rw-r--r-- | debian/local/gitattributes | 3 | ||||
| -rw-r--r-- | debian/local/gitconfig | 5 |
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 |