summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2023-02-18 18:13:32 +0100
committerRaymaekers Luca <raymaekers.luca@gmail.com>2023-02-18 18:13:32 +0100
commit6a7f2dd7a330a4591c219b900bc0cc0a17e78a74 (patch)
tree560bbc4bfed391e8addd30d9e84cd1a9498f1086
parenta9aab6f0eae3fdb9365791b2b3104d09ff50980d (diff)
added: (git) set 'merge' to default pull strategy
-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 92bd6e5..5d269ec 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -3,3 +3,5 @@
[user]
email = raymaekers.luca@gmail.com
name = Raymaekers Luca
+[pull]
+ rebase = false