From 62adfc7b6832ca1f9caa8bf28747e994a50eca26 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 29 Aug 2019 11:34:12 -0400 Subject: [PATCH] Allow difffing of rails credential files From: https://stackoverflow.com/questions/49514426/how-can-i-git-diff-changes-to-rails-5-2-credentials/50466819#50466819 --- gitattributes_global | 1 + gitconfig | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 gitattributes_global diff --git a/gitattributes_global b/gitattributes_global new file mode 100644 index 0000000..e2118f8 --- /dev/null +++ b/gitattributes_global @@ -0,0 +1 @@ +*.yml.enc diff=enc diff --git a/gitconfig b/gitconfig index 8e25545..7b0c8d6 100644 --- a/gitconfig +++ b/gitconfig @@ -34,6 +34,7 @@ [core] autocrlf = input excludesfile = ~/.gitignore_global + attributesfile = ~/.gitattributes_global filemode = false [gpg] program = gpg @@ -47,3 +48,6 @@ [transfer] fsckobjects = false # https://groups.google.com/forum/#!topic/binary-transparency/f-BI4o8HZW0 +[diff "enc"] + textconv = bundle exec rails encrypted:show + cachetextconv = false