Junio C Hamano | 14f9e12 | 2008-02-10 19:34:34 -0800 | [diff] [blame] | 1 | * whitespace=!indent,trail,space |
René Scharfe | e82675a | 2016-07-07 22:11:50 +0200 | [diff] [blame] | 2 | *.[ch] whitespace=indent,trail,space diff=cpp |
Johannes Schindelin | 00ddc9d | 2017-05-09 14:53:21 +0200 | [diff] [blame] | 3 | *.sh whitespace=indent,trail,space eol=lf |
Ævar Arnfjörð Bjarmason | 2046063 | 2018-04-26 07:50:57 +0000 | [diff] [blame] | 4 | *.perl eol=lf diff=perl |
| 5 | *.pl eof=lf diff=perl |
| 6 | *.pm eol=lf diff=perl |
Ævar Arnfjörð Bjarmason | 7818b61 | 2018-04-26 07:50:58 +0000 | [diff] [blame] | 7 | *.py eol=lf diff=python |
Johannes Schindelin | a5bdf9f | 2019-06-19 14:05:57 -0700 | [diff] [blame] | 8 | *.bat eol=crlf |
Nguyễn Thái Ngọc Duy | 54709d5 | 2018-11-10 19:23:23 +0100 | [diff] [blame] | 9 | /Documentation/**/*.txt eol=lf |
Johannes Schindelin | 00ddc9d | 2017-05-09 14:53:21 +0200 | [diff] [blame] | 10 | /command-list.txt eol=lf |
| 11 | /GIT-VERSION-GEN eol=lf |
| 12 | /mergetools/* eol=lf |
Derrick Stolee | fc767af | 2018-12-11 12:35:46 -0800 | [diff] [blame] | 13 | /t/oid-info/* eol=lf |
Thomas Gummerer | b9b07ef | 2018-08-28 23:05:50 +0100 | [diff] [blame] | 14 | /Documentation/git-merge.txt conflict-marker-size=32 |
| 15 | /Documentation/gitk.txt conflict-marker-size=32 |
| 16 | /Documentation/user-manual.txt conflict-marker-size=32 |
| 17 | /t/t????-*.sh conflict-marker-size=32 |