mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
a5bdf9fdf1
Just like the natural line ending for Unix shell scripts consist of a single Line Feed, the natural line ending for (DOS) Batch scripts consists of a Carriage Return followed by a Line Feed. It seems that both Unix shell script interpreters and the interpreter for Batch scripts (`cmd.exe`) are keen on seeing the "right" line endings. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 lines
544 B
Text
17 lines
544 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
|
|
*.bat eol=crlf
|
|
/Documentation/**/*.txt eol=lf
|
|
/command-list.txt eol=lf
|
|
/GIT-VERSION-GEN eol=lf
|
|
/mergetools/* eol=lf
|
|
/t/oid-info/* 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
|