git: only allow ff merges on pull
This commit is contained in:
parent
0d50f10fc6
commit
211498d107
1 changed files with 3 additions and 0 deletions
|
@ -18,6 +18,9 @@
|
|||
[push]
|
||||
default = nothing
|
||||
|
||||
[pull]
|
||||
ff = only
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue