add mergestrategie
This commit is contained in:
parent
992da95715
commit
056b632204
1 changed files with 2 additions and 0 deletions
|
@ -46,3 +46,5 @@
|
|||
path = ~/.gitconfig_local
|
||||
[status]
|
||||
submodulesummary = 1
|
||||
[pull]
|
||||
rebase = false
|
||||
|
|
Loading…
Reference in a new issue