summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2023-12-16 20:44:06 +0100
committerRaymaekers Luca <raymaekers.luca@gmail.com>2023-12-16 20:44:06 +0100
commitd75c2e1af43b44950dbb210da9fcc94a9b9656e8 (patch)
tree4ee1da301781151dd59301a71b9ec67187f99795 /config
parenta2819f2316fa14d87506fc77e973e03197bf7ce2 (diff)
rebase must exist
Diffstat (limited to 'config')
-rw-r--r--config/essentials/git/config4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index 66ed53e..92bd6e5 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -3,7 +3,3 @@
[user]
email = raymaekers.luca@gmail.com
name = Raymaekers Luca
-[pull]
- rebase = false
-[merge]
- ff = false