tmiller · April 12, 2017 15:47
diff --git a/.git_config b/.git_config
 [diff "ansible-vault"]
 	textconv = "ansible-vault view --vault-password-file=.vault_password"
 	cachetextconv = false
diff --git a/.git_info_attributes b/.git_info_attributes
 *.asc diff=ansible-vault merge=binary
diff --git a/.git_info_exclude b/.git_info_exclude
 .vault_password
	[diff "ansible-vault"]
	textconv = "ansible-vault view --vault-password-file=.vault_password"
	cachetextconv = false