summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Vertes <mvertes@free.fr>2020-06-02 15:22:54 +0200
committerMarc Vertes <mvertes@free.fr>2020-06-02 15:22:54 +0200
commit94986a8c82df42f12e014e8d4abd1ecf5d2ef698 (patch)
tree01c04147204ffb36ea352303e49b182d96539f38
parent01d9cae2ec7bf62ec78eb129f598984e7e065926 (diff)
update
-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