summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2018-10-04 18:20:52 +0100
committerdakkar <dakkar@thenautilus.net>2018-10-04 18:21:18 +0100
commit46a8e46bef1d1ba0de143e71bd83b61f23655ee6 (patch)
tree6e2a512161977d032f8ca74a00b515c6841444df
parentnewer redshift config (diff)
downloaddotfiles-46a8e46bef1d1ba0de143e71bd83b61f23655ee6.tar.gz
dotfiles-46a8e46bef1d1ba0de143e71bd83b61f23655ee6.tar.bz2
dotfiles-46a8e46bef1d1ba0de143e71bd83b61f23655ee6.zip
pull-rebase-preserve!
-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