X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/fb956d607c2e73a79e872047eaa4c6bd18455a1c..70cdafa58dfcc8e284cd11ff94e2d3f63186d76d:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 5fb3243..c24fa43 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,14 +1,15 @@
 [user]
 	name = martin f. krafft
 	email = madduck@madduck.net
-	signingkey = 330c4a75
+	signingkey = 999bbcc4
 [core]
 	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]
@@ -34,8 +38,12 @@
 	ui = auto
 [url "ssh://git.debian.org/git/"]
 	insteadOf = alioth:
+[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]
@@ -44,3 +52,5 @@
 	autocorrect = 5
 [format]
 	signoff = true
+[rerere]
+	enabled = true