diff --git a/git/.config/git/gitattributes_global b/git/.config/git/gitattributes_global
new file mode 100644
index 0000000..e2118f8
--- /dev/null
+++ b/git/.config/git/gitattributes_global
@@ -0,0 +1 @@
+*.yml.enc diff=enc
diff --git a/git/.gitconfig b/git/.gitconfig
index ed2dea2..f13728d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,6 +11,7 @@
 
 [core]
   autocrlf = input
+  attributesfile = ~/.config/git/gitattributes_global
   excludesfile = ~/.config/git/gitignore_global
 
 [github]
@@ -33,5 +34,9 @@
   name = Andrew Tomaka
   signingkey = 61209BF70A5B18BE
 
+[diff "enc"]
+  textconv = bundle exec rails encrypted:show
+  cachetextconv = false
+
 [includeIf "gitdir:~/Source/work/"]
   path = ~/.config/git/gitconfig_benefitbay