diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-01-14 22:41:01 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-01-14 22:41:01 -0700 |
| commit | f828071052d68b30d0d2dbcfa0f037de74b05d94 (patch) | |
| tree | 36480d8dcd6ba3ef63096d2bfdaf88b4bde7ed26 /.gitconfig | |
| parent | ce4e262d819f97a5d62e09a0c0738594efc52d87 (diff) | |
| download | dotfiles-f828071052d68b30d0d2dbcfa0f037de74b05d94.tar.gz | |
enable dpkg-mergechangelogs git merge driver
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -84,3 +84,7 @@ multiedit = false from = Sean Whitton <spwhitton@spwhitton.name> annotate = true + +[merge "dpkg-mergechangelogs"] + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A |