From 6f189cba9e5acccd6ec69ddd0578765833bc29ba Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Mon, 16 Oct 2023 14:18:51 +0300
Subject: [PATCH] .gitattributes: define macro attribute binaryd for binary
 diff

---
 .gitattributes | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 2e552334..81c49829 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,6 +13,13 @@
 #   - Avoid merge-conflict when merging from .gitattributeless branch to
 #     .gitattributed branch
 
+# This is the default "binary" macro attribute, but with diffing allowed.
+# Use when file contains diffable text, but isn't actually plaintext and thus
+# shouldn't have EOL conversion done.
+[attr]binaryd diff -merge -text
+# Example:
+#*.db	binaryd
+
 # Built-in diff patterns (disabled by default). The attribute `diff` implies
 # `text` and the above attributes are inherited.
 # https://www.git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header