Correct git pull warning

This commit is contained in:
Andrew Tomaka 2021-03-24 20:44:50 -04:00
parent 30389409fe
commit cbc8bede7a
Signed by: atomaka
GPG key ID: 61209BF70A5B18BE

View file

@ -51,3 +51,5 @@
[diff "enc"]
textconv = bundle exec rails encrypted:show
cachetextconv = false
[pull]
ff = only