X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/5a745e203aeac0a0521f7fade41c9c229119a5e3..dd768e5523542b20f62db5512586453b6cd4fbe5:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index 13957d2..ee3ea53 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,7 +8,6 @@
 [diff]
 	renames = copies
 [alias]
-	restore = checkout HEAD
 	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"
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
@@ -47,10 +46,8 @@
 	pushInsteadOf = madduck-anon:
 [url "ssh://git@git.madduck.net/madduck/pub/"]
 	pushInsteadOf = git://git.madduck.net/madduck/pub/
-[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/madduck/pub/"]
+	insteadOf = madduck-pub:
 [url "ssh://git@git.madduck.net/gitolite-admin"]
 	insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
@@ -68,3 +65,5 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[advice]
+	ignoredHook = false