summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 82d1f09..3459f0e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,3 +10,5 @@
[user]
email = mvertes@free.fr
name = Marc Vertes
+[pull]
+ rebase = false