diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-10 00:51:10 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-10 00:51:10 -0800 |
commit | 684eb58db992dec56a05719732edc547fa77c1be (patch) | |
tree | af39cc2a3b06fb0483e2477513c5eb3a7605eee0 /.gitattributes | |
parent | d2c7fda9654a79423be8320bc2028263aefccced (diff) | |
download | emacs-684eb58db992dec56a05719732edc547fa77c1be.tar.gz |
* .gitattributes: *.cur and *.pif are binary files too.
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 8f61c807d72..5ccf9a5eabb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,12 +34,14 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol doc/misc/texinfo.tex -whitespace=blank-at-eol # Some files should not be treated as text when diffing or merging. +*.cur binary *.gpg binary *.gz binary *.icns binary *.ico binary *.pbm binary *.pdf binary +*.pif binary *.png binary *.sig binary *.tiff binary |