X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0f97eee42bc7e8c372bfd4a81f40361b2de3e7fd..9ca62e3937881582bbd54d8856cf53e80c0d4548:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 00ab0c7..4265532 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,7 @@
 [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]
@@ -16,6 +16,7 @@
 	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]
@@ -23,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]
@@ -41,6 +45,8 @@
 	insteadOf = 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]
@@ -49,3 +55,5 @@
 	autocorrect = 5
 [format]
 	signoff = true
+[rerere]
+	enabled = true