summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index f15daf3..3ba30d2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,7 +19,7 @@
[push]
default = tracking
[pull]
- rebase = true
+ rebase = preserve
[diff]
mnemonicprefix = true
renames = copies