mirror of
https://github.com/git-for-windows/git.git
synced 2026-03-17 22:19:19 -05:00
c3e64bcd1f
This patch made it into git.git's `master` already, inserting the line at a different spot, that's why we did not notice in Git for Windows why it is no longer needed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
17 lines
529 B
Plaintext
17 lines
529 B
Plaintext
* 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
|
|
/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
|