X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/153bac3efb398f6e22bc95be7efde4ef57a50a1e..a58ca949d53c406211bb6f19190a3eb66ba88b40:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index dbb74a2..c15fdd8 100644
--- 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,11 @@
 	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]
 	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
@@ -29,7 +35,20 @@
 	diff = auto
 	interactive = auto
 	status = auto
-[url "git+ssh://git.debian.org/git/"]
+	ui = auto
+[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