-* whitespace=indent-with-non-tab,trailing-space,space-before-tab,tabwidth=4
-* encoding=US-ASCII
-git-gui.sh encoding=UTF-8
-/po/*.po encoding=UTF-8
+* 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