summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:57 (GMT)
commitca6e972dde9c2f15fb19b087b2202eee9318c6cd (patch)
tree4adf47c9f38c137b3e30dcff11369d4ec9529839
parent0466aebd3a195ded2731cc3b60c44f664fe00a65 (diff)
parent54709d520466d6e1d2feab6499a3fc6bf348e32a (diff)
downloadgit-ca6e972dde9c2f15fb19b087b2202eee9318c6cd.zip
git-ca6e972dde9c2f15fb19b087b2202eee9318c6cd.tar.gz
git-ca6e972dde9c2f15fb19b087b2202eee9318c6cd.tar.bz2
Merge branch 'nd/command-list-gen-fix'
Build tweak. * nd/command-list-gen-fix: build: fix broken command-list.h generation with core.autocrlf
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 49b3051..acf853e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,7 +5,7 @@
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
-/Documentation/git-*.txt eol=lf
+/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
/mergetools/* eol=lf