about summary refs log tree commit diff
path: root/git
diff options
context:
space:
mode:
authorBen Harris <ben@tilde.team>2018-08-15 16:06:27 -0400
committerBen Harris <ben@tilde.team>2018-08-15 16:06:50 -0400
commit3313c24dbfadecf5fda99649e5bcdd6863de8be9 (patch)
tree8ca66d8a1bb7b90fb5c72da36b11fd8c1391903c /git
parent21a5478434a067793adc48e9e260a20818c668ce (diff)
add ansible-vault to .gitconfig
Diffstat (limited to 'git')
-rwxr-xr-xgit/.gitconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 92f196f..1467234 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -2,9 +2,21 @@
 	email = ben@tilde.team
 	name = Ben Harris
 	signingkey = FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A
+
 [push]
 	default = simple
+
 [commit]
 	gpgsign = true
+
 [pull]
 	ff = only
+
+[diff "gpg"]
+	textconv = gpg --no-tty --decrypt
+	cachetextconv = false
+
+[diff "ansible-vault"]
+	textconv = ansible-vault view
+	cachetextconv = false
+