X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0d48b85ba991a9f4b66def869c50e6052bb7ddc5..dd60cc4cf43f235234174d39f0a10d6ba19f64d3:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 90f3987..d77298f 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,13 +47,20 @@
 	insteadOf = madduck:
 [url "ssh://git.madduck.net/madduck/pub/"]
 	pushInsteadOf = git://git.madduck.net/madduck/
+[url "ssh://git.gern.madduck.net/srv/git"]
+	insteadOf = git-at-home:
+[url "ssh://git.madduck.net/gitolite-admin"]
+	insteadOf = gitolite-admin:
 [push]
 	default = matching
 [sendemail]
 	confirm = auto
+	assume8bitEncoding = true
 [help]
 	autocorrect = 5
 [format]
 	signoff = true
 [rerere]
 	enabled = true
+[rebase]
+	autosquash = true