X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/3d1e4f1ed9ccd174f23e4c51935d5273eb68c024..821d3028f391ed1659186b68659d902dd0a2713e:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 83f80cd..170d504 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
@@ -49,8 +48,6 @@
 	pushInsteadOf = git://git.madduck.net/madduck/pub/
 [url "ssh://git.madduck.net/madduck/pub/"]
 	insteadOf = madduck-pub:
-[url "ssh://git.madduck.net/pm/"]
-	insteadOf = pm:
 [url "ssh://git@git.madduck.net/gitolite-admin"]
 	insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
@@ -68,5 +65,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false