summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2023-10-28 00:07:25 +0200
committerRaymaekers Luca <raymaekers.luca@gmail.com>2023-10-28 00:07:25 +0200
commita994e2a5e54c766d2c0b74aa16180a03272e9310 (patch)
tree5a7a111eeb5cba4620f4f3c02081947fc36a2322
parent71ff07813ec02b7d1e2936e96fba27beb76dd526 (diff)
always create commit
-rw-r--r--config/essentials/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index 5d269ec..66ed53e 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -5,3 +5,5 @@
name = Raymaekers Luca
[pull]
rebase = false
+[merge]
+ ff = false