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