projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: Add contrib installation
[platform/upstream/git.git]
/
.gitattributes
diff --git
a/.gitattributes
b/.gitattributes
index
1bdc91e
..
b08a141
100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-5,7
+5,13
@@
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
-/Documentation/git-*.txt eol=lf
+*.bat eol=crlf
+/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
/mergetools/* 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