diff options
| author | Paul Eggert | 2016-01-10 00:51:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-10 00:51:10 -0800 |
| commit | 684eb58db992dec56a05719732edc547fa77c1be (patch) | |
| tree | af39cc2a3b06fb0483e2477513c5eb3a7605eee0 | |
| parent | d2c7fda9654a79423be8320bc2028263aefccced (diff) | |
| download | emacs-684eb58db992dec56a05719732edc547fa77c1be.tar.gz emacs-684eb58db992dec56a05719732edc547fa77c1be.zip | |
* .gitattributes: *.cur and *.pif are binary files too.
| -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 | |||
| 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol | 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol |
| 35 | 35 | ||
| 36 | # Some files should not be treated as text when diffing or merging. | 36 | # Some files should not be treated as text when diffing or merging. |
| 37 | *.cur binary | ||
| 37 | *.gpg binary | 38 | *.gpg binary |
| 38 | *.gz binary | 39 | *.gz binary |
| 39 | *.icns binary | 40 | *.icns binary |
| 40 | *.ico binary | 41 | *.ico binary |
| 41 | *.pbm binary | 42 | *.pbm binary |
| 42 | *.pdf binary | 43 | *.pdf binary |
| 44 | *.pif binary | ||
| 43 | *.png binary | 45 | *.png binary |
| 44 | *.sig binary | 46 | *.sig binary |
| 45 | *.tiff binary | 47 | *.tiff binary |