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

diff --git a/.gitconfig b/.gitconfig
index ee3ea53..170d504 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -65,5 +65,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false