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

.gitattributes: add suggestions for gitconfig

Browse Source
This commit is contained in:
Aminda Suomalainen 2023-10-15 18:55:01 +03:00
parent ab42bd67cd
commit 6caaf8a920
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitattributes vendored
View File

@ -2,6 +2,17 @@
# languages. For more information: `man gitattributes` # languages. For more information: `man gitattributes`
* text=auto eol=lf linguist-detectable * text=auto eol=lf linguist-detectable
# Suggestions for inevitably encountering .gitattributeless repositories when
# .gitattributes cannot be added:
# git config --global core.autocrlf input
# - `* text=auto` when there is no `.gitattributes`. In other words,
# commit eol=lf, check-out as it is.
# git config --global core.safecrlf warn
# - Warn if EOL change is irreversible.
# git config --global merge.renormalize true
# - Avoid merge-conflict when merging from .gitattributeless branch to
# .gitattributed branch
# 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