Merge branch 'master' into comment-cache
[emacs.git] / .gitattributes
blob22cea3dc1e3b8709e4d550978e52f0ec2453041a
1 # Attributes of Emacs files in the Git repository.
3 # Copyright 2015-2017 Free Software Foundation, Inc.
5 # This file is part of GNU Emacs.
7 # GNU Emacs is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # GNU Emacs is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
20 # A few files use CRLF endings, even on non-Microsoft platforms.
21 # Do not warn about trailing whitespace with these files.
22 *.bat whitespace=cr-at-eol
23 admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
24 leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
25 leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
26 leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
27 lib-src/update-game-score.exe.manifest whitespace=cr-at-eol
28 nt/nmake.defs whitespace=cr-at-eol
29 test/etags/c-src/dostorture.c whitespace=cr-at-eol
30 test/etags/cp-src/c.C whitespace=cr-at-eol
31 test/etags/html-src/algrthms.html whitespace=cr-at-eol
33 # The upstream maintainer does not want to remove trailing whitespace.
34 doc/misc/texinfo.tex -whitespace=blank-at-eol
36 # Some files should not be treated as text when diffing or merging.
37 *.cur binary
38 *.gpg binary
39 *.gz binary
40 *.icns binary
41 *.ico binary
42 *.pbm binary
43 *.pdf binary
44 *.pif binary
45 *.png binary
46 *.sig binary
47 *.tiff binary
48 etc/e/eterm-color binary
50 # Git's builtin diff hunk header styles.
51 *.ada diff=ada
52 *.[ch] diff=cpp
53 *.cc diff=cpp
54 *.cpp diff=cpp
55 *.hh diff=cpp
56 *.for diff=fortran
57 *.html diff=html
58 *.shtml diff=html
59 *.xml diff=html
60 *.java diff=java
61 *.m diff=objc
62 *.perl diff=perl
63 *.pl diff=perl
64 *.php diff=php
65 *.py diff=python
66 *.rb diff=ruby
67 *.ruby diff=ruby
68 *.tex diff=tex
70 # Hooks for non-default diff hunk headers; see autogen.sh.
71 *.el diff=elisp
72 *.ac diff=m4
73 *.m4 diff=m4
74 *.mk diff=make
75 *[Mm]akefile diff=make
76 Makefile.in diff=make
77 *.sh diff=shell
78 *.texi diff=texinfo
80 # Diff hunk header special-case file names.
81 admin/build-configs diff=perl
82 admin/charsets/mapconv diff=shell
83 admin/diff-tar-files diff=shell
84 admin/make-emacs diff=perl
85 admin/merge-gnulib diff=shell
86 admin/merge-pkg-config diff=shell
87 admin/quick-install-emacs diff=shell
88 admin/update-copyright diff=shell
89 admin/update_autogen diff=shell
90 build-aux/git-hooks/commit-msg diff=shell
91 build-aux/git-hooks/pre-commit diff=shell
92 build-aux/gitlog-to-emacslog diff=shell
93 build-aux/make-info-dir diff=shell
94 build-aux/move-if-change diff=shell
95 build-aux/msys-to-w32 diff=shell
96 build-aux/update-subdirs diff=shell
97 lib-src/rcs2log diff=shell
98 /make-dist diff=shell