]> git.madduck.net Git - etc/git.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0f97eee)
add mergechangelogs driver
authormartin f. krafft <madduck@madduck.net>
Mon, 30 Aug 2010 20:09:57 +0000 (22:09 +0200)
committermartin f. krafft <madduck@madduck.net>
Mon, 30 Aug 2010 20:10:03 +0000 (22:10 +0200)
.gitconfig patch | blob | history

diff --git a/.gitconfig b/.gitconfig
index 00ab0c7b9e2cca6edab811b57e1442aa8954fbb8..c15fdd819291afad22c230a58f184e3b12136c22 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,6 +23,9 @@
        autosetuprebase = remote
 [merge]
        tool = vimdiff
+[merge "dpkg-mergechangelogs"]
+       name = debian/changelog merge driver
+       driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
        tool = vimdiff
 [gui]
git configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.