1 files changed, 6 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index e503780..7aa8870 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,9 @@
 ; git config --local include.path '../.gitconfig'
 [push]
  recurseSubmodules = on-demand
+; Find a way to include this file automatically?
+; git -C nixops/secrets config --local diff.gpgdiffer.textconv "gpg --quiet -d"
+[diff "gpgdiffer"]
+        textconv = "gpg --quiet -d"
+[diff "sopsdiffer"]
+        textconv = "sops -d"

diff --git a/.gitconfig b/.gitconfig index e503780..7aa8870 100644 --- a/.gitconfig +++ b/.gitconfig
@@ -1,3 +1,9 @@
1	; git config --local include.path '../.gitconfig'	1	; git config --local include.path '../.gitconfig'
2	[push]	2	[push]
3	recurseSubmodules = on-demand	3	recurseSubmodules = on-demand
		4	; Find a way to include this file automatically?
		5	; git -C nixops/secrets config --local diff.gpgdiffer.textconv "gpg --quiet -d"
		6	[diff "gpgdiffer"]
		7	textconv = "gpg --quiet -d"
		8	[diff "sopsdiffer"]
		9	textconv = "sops -d"