X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/6a98089b3eb2c9f9de849b65109b0a92fd501e45..a58ca949d53c406211bb6f19190a3eb66ba88b40:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index eafc02b..c15fdd8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,7 +8,8 @@
 	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]
@@ -38,7 +42,7 @@
 	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/
 [push]
 	default = matching