X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0da936e790e3d09b665c1e1b7de9fe905b7762ee..e122b22fa490418bb9caa430edbbedaefff958b2:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 0682c02..9f235f2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,8 @@
 	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]
@@ -45,12 +47,19 @@
 	insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/pub/"]
 	pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.gern.madduck.net/srv/git/"]
+	insteadOf = pmg:
+[url "ssh://shared.gern.madduck.net/srv/gern/"]
+	insteadOf = pm:
 [url "ssh://git.madduck.net/gitolite-admin"]
 	insteadOf = gitolite-admin:
+[url "ssh://admin.madduck.net/"]
+	insteadOf = sysadmin:
 [push]
 	default = matching
 [sendemail]
 	confirm = auto
+	assume8bitEncoding = true
 [help]
 	autocorrect = 5
 [format]