change merge-strategy
This commit is contained in:
parent
de9ff26861
commit
f5a74e3f03
1 changed files with 0 additions and 2 deletions
|
@ -48,5 +48,3 @@
|
|||
path = ~/.gitconfig_local
|
||||
[status]
|
||||
submodulesummary = 1
|
||||
[pull]
|
||||
rebase = true
|
||||
|
|
Loading…
Reference in a new issue