Correct git pull warning
This commit is contained in:
parent
30389409fe
commit
cbc8bede7a
1 changed files with 2 additions and 0 deletions
|
@ -51,3 +51,5 @@
|
|||
[diff "enc"]
|
||||
textconv = bundle exec rails encrypted:show
|
||||
cachetextconv = false
|
||||
[pull]
|
||||
ff = only
|
||||
|
|
Loading…
Reference in a new issue