| commit | 3d5c174581aaa7884d618d0cf8fa02cde3cf50dc | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 10 Jul 2017 19:10:57 +0000 (10 12:10 -0700) | ||
| committer | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 8 Jul 2019 17:47:51 +0000 (8 10:47 -0700) | ||
| tree | ca1b9ce864fcaf935d3108b88176893e0dc4c1b3 | treesnapshot (tar.gz zip) |
| parent | 98b89a26d41a57bfa9f14c91b1a60ca87deee4d6 | commitdiff |
debian: set attribute for debian/changelog merge driver
This way, any developer with
[merge "dpkg-mergechangelogs"]
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A
in their ~/.config/git/config or ~/.gitconfig will get more
sensible handling of debian/changelog when they use "git merge"
to merge between branches.
Requested-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This way, any developer with
[merge "dpkg-mergechangelogs"]
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A
in their ~/.config/git/config or ~/.gitconfig will get more
sensible handling of debian/changelog when they use "git merge"
to merge between branches.
Requested-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
| debian/.gitattributes | [new file with mode: 0644] | blob |