2015-01-01 16:58:26 +00:00
|
|
|
# Attributes of Emacs files in the Git repository.
|
|
|
|
|
2016-01-01 09:16:19 +00:00
|
|
|
# Copyright 2015-2016 Free Software Foundation, Inc.
|
2015-01-01 16:58:26 +00:00
|
|
|
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
# A few files use CRLF endings, even on non-Microsoft platforms.
|
|
|
|
# Do not warn about trailing whitespace with these files.
|
2015-06-01 15:01:49 +00:00
|
|
|
*.bat whitespace=cr-at-eol
|
|
|
|
admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
|
|
|
|
leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
|
|
|
|
leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
|
|
|
|
leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
|
|
|
|
lib-src/update-game-score.exe.manifest whitespace=cr-at-eol
|
|
|
|
nt/nmake.defs whitespace=cr-at-eol
|
|
|
|
test/etags/c-src/dostorture.c whitespace=cr-at-eol
|
|
|
|
test/etags/cp-src/c.C whitespace=cr-at-eol
|
|
|
|
test/etags/html-src/algrthms.html whitespace=cr-at-eol
|
2015-01-01 16:58:26 +00:00
|
|
|
|
2015-02-04 02:24:50 +00:00
|
|
|
# The upstream maintainer does not want to remove trailing whitespace.
|
|
|
|
doc/misc/texinfo.tex -whitespace=blank-at-eol
|
|
|
|
|
2015-01-01 16:58:26 +00:00
|
|
|
# Some files should not be treated as text when diffing or merging.
|
2016-01-10 08:51:10 +00:00
|
|
|
*.cur binary
|
2015-01-01 16:58:26 +00:00
|
|
|
*.gpg binary
|
|
|
|
*.gz binary
|
|
|
|
*.icns binary
|
|
|
|
*.ico binary
|
|
|
|
*.pbm binary
|
|
|
|
*.pdf binary
|
2016-01-10 08:51:10 +00:00
|
|
|
*.pif binary
|
2015-01-01 16:58:26 +00:00
|
|
|
*.png binary
|
|
|
|
*.sig binary
|
|
|
|
*.tiff binary
|
2015-05-30 16:33:41 +00:00
|
|
|
etc/e/eterm-color binary
|
2015-09-21 18:56:01 +00:00
|
|
|
|
Improve diff hunk headers when maintaining Emacs
* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.
2016-03-13 19:20:01 +00:00
|
|
|
# Git's builtin diff hunk header styles.
|
|
|
|
*.ada diff=ada
|
|
|
|
*.[ch] diff=cpp
|
|
|
|
*.cc diff=cpp
|
|
|
|
*.cpp diff=cpp
|
|
|
|
*.hh diff=cpp
|
|
|
|
*.for diff=fortran
|
|
|
|
*.html diff=html
|
|
|
|
*.shtml diff=html
|
|
|
|
*.xml diff=html
|
|
|
|
*.java diff=java
|
|
|
|
*.m diff=objc
|
|
|
|
*.perl diff=perl
|
|
|
|
*.pl diff=perl
|
|
|
|
*.php diff=php
|
|
|
|
*.py diff=python
|
|
|
|
*.rb diff=ruby
|
|
|
|
*.ruby diff=ruby
|
|
|
|
*.tex diff=tex
|
|
|
|
|
2015-09-21 18:56:01 +00:00
|
|
|
# Hooks for non-default diff hunk headers; see autogen.sh.
|
|
|
|
*.el diff=elisp
|
Improve diff hunk headers when maintaining Emacs
* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.
2016-03-13 19:20:01 +00:00
|
|
|
*.ac diff=m4
|
|
|
|
*.m4 diff=m4
|
|
|
|
*.mk diff=make
|
|
|
|
*[Mm]akefile diff=make
|
|
|
|
Makefile.in diff=make
|
|
|
|
*.sh diff=shell
|
2015-09-21 18:56:01 +00:00
|
|
|
*.texi diff=texinfo
|
Improve diff hunk headers when maintaining Emacs
* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.
2016-03-13 19:20:01 +00:00
|
|
|
#
|
|
|
|
# Diff hunk header special-case file names.
|
|
|
|
admin/build-configs diff=perl
|
|
|
|
admin/charsets/mapconv diff=shell
|
|
|
|
admin/diff-tar-files diff=shell
|
|
|
|
admin/make-emacs diff=perl
|
|
|
|
admin/merge-gnulib diff=shell
|
|
|
|
admin/merge-pkg-config diff=shell
|
|
|
|
admin/quick-install-emacs diff=shell
|
|
|
|
admin/update-copyright diff=shell
|
|
|
|
admin/update_autogen diff=shell
|
|
|
|
build-aux/git-hooks/commit-msg diff=shell
|
|
|
|
build-aux/git-hooks/pre-commit diff=shell
|
|
|
|
build-aux/gitlog-to-emacslog diff=shell
|
|
|
|
build-aux/make-info-dir diff=shell
|
|
|
|
build-aux/move-if-change diff=shell
|
|
|
|
build-aux/msys-to-w32 diff=shell
|
|
|
|
build-aux/update-subdirs diff=shell
|
|
|
|
lib-src/rcs2log diff=shell
|
|
|
|
/make-dist diff=shell
|