diff --git a/.gitattributes b/.gitattributes index 8dc4323..06ac622 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,5 +5,7 @@ db/schema.rb linguist-generated # Mark any vendored files as having been vendored. vendor/* linguist-vendored + +# Tell git how to diff encrypted files config/credentials/*.yml.enc diff=rails_credentials config/credentials.yml.enc diff=rails_credentials