Force ff-only for merge
This commit is contained in:
parent
dbeca13721
commit
f9bba1b3ef
1 changed files with 2 additions and 0 deletions
|
@ -4,6 +4,8 @@
|
|||
[pull]
|
||||
ff = only
|
||||
rebase = false
|
||||
[merge]
|
||||
ff = only
|
||||
[push]
|
||||
default = simple
|
||||
[color]
|
||||
|
|
Loading…
Reference in a new issue