aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/config b/git/config
index ee78039..b4f6cb9 100644
--- a/git/config
+++ b/git/config
@@ -96,6 +96,9 @@
[push]
default = simple
+[pull]
+ rebase = preserve
+
[repack]
writebitmaps = true
autosquash = true