Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2024-11-22 03:09:22 +01:00
Code Issues Projects Releases Wiki Activity

.gitattributes: define macro attribute binaryd for binary diff

Browse Source
This commit is contained in:
Aminda Suomalainen 2023-10-16 14:18:51 +03:00
parent 8954849bcc
commit 6f189cba9e
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitattributes vendored
View File

@ -13,6 +13,13 @@
# - Avoid merge-conflict when merging from .gitattributeless branch to # - Avoid merge-conflict when merging from .gitattributeless branch to
# .gitattributed branch # .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 # Built-in diff patterns (disabled by default). The attribute `diff` implies
# `text` and the above attributes are inherited. # `text` and the above attributes are inherited.
# https://www.git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header # https://www.git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header