Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'

[thirdparty/git.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 59cd41dbff72e3073f5ef0380350ec9ea3c4af5b..b08a1416d86012134f823fe51443f498f4911909 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,17 @@
-*           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