git merge by default

2023-09-11 23:09:02 +02:00 · 2023-09-11 23:09:02 +02:00 · 1ed0c53a2a
parent 9cf6dda6d2
commit 1ed0c53a2a
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -6,3 +6,5 @@
 	helper = store --file ~/.git-credentials
 [commit]
 	gpgsign = false
+[pull]
+	rebase = false