diff --git a/git/config b/git/config
index f2d46b1..63c7c80 100644
--- a/git/config
+++ b/git/config
@@ -18,6 +18,7 @@
 	s = stash
 	sl = stash list
 	ss = stash show
+	deploy = !git checkout production && git merge --ff-only origin/develop
 [diff]
 	tool = vimdiff
 [merge]
@@ -39,3 +40,5 @@
 	rebase = true
 [init]
 	defaultBranch = main
+[diff "ansible-vault"]
+	textconv = ansible-vault view