X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/716ecb8dd6c3b76822a26b09b2059d263b3fb4c3..552942f8982b70d66ac6c2f4ad9426801e388289:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 88d15e2..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
@@ -66,5 +65,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false