add mergestrategie

This commit is contained in:
Jakobus Schürz 2021-10-11 20:40:39 +02:00
parent 992da95715
commit 056b632204

View file

@ -46,3 +46,5 @@
path = ~/.gitconfig_local
[status]
submodulesummary = 1
[pull]
rebase = false