2 years ago · 59ee23f292
parent 79b0e6c35d
commit 59ee23f292
1 changed files with 3 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -24,6 +24,9 @@

    #whitespace = trailing-space,space-before-tab

+[pull]
+    rebase = false
+
 [push]
 #   default = current
    default = simple