X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0408c95ba09c9798a824a89ae3b5684fe541a6c0..51a9858e71143bce9a9c50aea93d7f8741e1d133:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index be05efa..a2e8b44 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,9 @@
 	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
+	sq = "!merge_squash_commit() { git merge --squash \"$1\" && git commit -m \"$1 squash\"; }; merge_squash_commit"
+	fixup = "!fixup_commit() { local c=\"$1\"; shift; git commit --fixup=\"$c\" \"$@\"; }; fixup_commit"
 [clean]
 	requireForce = true
 [branch]
@@ -44,6 +47,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]
@@ -54,3 +59,5 @@
 	signoff = true
 [rerere]
 	enabled = true
+[rebase]
+	autosquash = true