dot/gitconfig.in: Add explicit `pull' setting.

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 9a55627..20235cb 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -40,8 +40,11 @@
 [rebase]
        autosquash = true
 
+[pull]
+       rebase = false
+
 [push]
-       default = matching
+       default = upstream
        followTags = true
 
 [format]