mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-12-22 10:42:55 +01:00
.gitattributes: add suggestions for gitconfig
This commit is contained in:
parent
ab42bd67cd
commit
6caaf8a920
11
.gitattributes
vendored
11
.gitattributes
vendored
@ -2,6 +2,17 @@
|
||||
# languages. For more information: `man gitattributes`
|
||||
* 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
|
||||
# `text` and the above attributes are inherited.
|
||||
# https://www.git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header
|
||||
|
Loading…
Reference in New Issue
Block a user