add mergechangelogs driver

[etc/git.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 599938469f035d16c23ffbafe54f7f18d60018d1..c15fdd819291afad22c230a58f184e3b12136c22 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,12 +3,13 @@
        email = madduck@madduck.net
        signingkey = 330c4a75
 [core]
-       pager = "less -Fr"
+       pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 [diff]
        renames = copies
 [alias]
        restore = checkout HEAD
-       dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | gzip -9 > ../$(git describe HEAD).tar.gz"
+       dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
+       ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
        st = status
        co = checkout
        ci = commit -a
@@ -22,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]
@@ -32,11 +36,19 @@
        interactive = auto
        status = auto
        ui = auto
-[url "git+ssh://git.debian.org/git/"]
+[url "ssh://git.debian.org/git/"]
        insteadOf = alioth:
-[url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
+[url "git://git.madduck.net/madduck/pub/"]
+       insteadOf = madduck-anon:
+[url "ssh://git.madduck.net/madduck/"]
        insteadOf = madduck:
+[url "ssh://git.madduck.net/madduck/pub/"]
+       pushInsteadOf = git://git.madduck.net/madduck/
 [push]
        default = matching
 [sendemail]
        confirm = auto
+[help]
+       autocorrect = 5
+[format]
+       signoff = true