git: change pull default to ff
This commit is contained in:
parent
df0783b604
commit
b59bc640dc
@ -140,4 +140,5 @@
|
|||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
#rebase = true
|
||||||
|
ff = only
|
||||||
|
Loading…
Reference in New Issue
Block a user