aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@rak.ac>2020-12-13 15:40:04 -0500
committerRyan Kavanagh <rak@rak.ac>2020-12-13 15:40:04 -0500
commit042206af74eae4b55c96e3a2e25764bccb800f22 (patch)
tree5c16eafb85a048039ccc5ba0616d948686e3dd8e
parentModernize s-nail config (diff)
Let git show diffs for gpg files
-rw-r--r--.gitattributes2
-rw-r--r--.gitconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d22bce5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.gpg filter=gpg diff=gpg
+*.asc filter=gpg diff=gpg
diff --git a/.gitconfig b/.gitconfig
index 3af1f46..bead2ea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -36,3 +36,5 @@
[diff]
mnemonicPrefix = true
algorithm = histogram
+[diff "gpg"]
+ textconv = gpg --no-tty --decrypt