X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/3edbc2ed98b96f2f4e37657130383c305623bfa9..18d9b7022affcb10b27e69342d9b2c0f867ca87e:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index 9b5a1f3..4265532 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,22 @@
 [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
 	stat = status
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
 	sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
+	unstage = reset HEAD
 [clean]
 	requireForce = true
 [branch]
@@ -22,6 +24,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,10 +39,14 @@
 	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:
-	pushInsteadOf = madduck:
+[url "ssh://git.madduck.net/madduck/pub/"]
 	pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.madduck.net/gitolite-admin"]
+	insteadOf = gitolite-admin:
 [push]
 	default = matching
 [sendemail]
@@ -46,3 +55,5 @@
 	autocorrect = 5
 [format]
 	signoff = true
+[rerere]
+	enabled = true