mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
54709d5204
The script generate-cmdlist.sh needs input text files in UNIX line
ending to work correctly. It's been fine even with core.autocrlf set
because Documentation/git-*.txt is forced LF conversion.
But this leaves out gitk.txt and also Documentation/*config.txt that
recently becomes new input for this script. Update the attribute file
to force LF on all *.txt files to be on the safe side.
For more details, please see 00ddc9d13c (Fix build with
core.autocrlf=true - 2017-05-09)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 lines
508 B
Text
15 lines
508 B
Text
* whitespace=!indent,trail,space
|
|
*.[ch] whitespace=indent,trail,space diff=cpp
|
|
*.sh whitespace=indent,trail,space eol=lf
|
|
*.perl eol=lf diff=perl
|
|
*.pl eof=lf diff=perl
|
|
*.pm eol=lf diff=perl
|
|
*.py eol=lf diff=python
|
|
/Documentation/**/*.txt eol=lf
|
|
/command-list.txt eol=lf
|
|
/GIT-VERSION-GEN eol=lf
|
|
/mergetools/* eol=lf
|
|
/Documentation/git-merge.txt conflict-marker-size=32
|
|
/Documentation/gitk.txt conflict-marker-size=32
|
|
/Documentation/user-manual.txt conflict-marker-size=32
|
|
/t/t????-*.sh conflict-marker-size=32
|