summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 5dd415b..bf77822 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,3 +7,6 @@
smtpserver = mail.gymli.org
smtpuser = dholman
smtpserverport = 587
+
+[pull]
+ rebase = false