summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVignesh Rajendran <vignesh.rajendran@in.bosch.com>2019-11-08 16:32:55 +0100
committerTom Rini <trini@konsulko.com>2019-11-11 14:20:35 -0500
commitd6da4da3beba40f0c8b54d8f70c627da4d001d94 (patch)
treeef48e6e190f2ed19056ceeb626296ecee007f4d2
parentd25a2d386c1cc9cfa87f205b9c863160882437ef (diff)
gitattributes: dont treat non-text files as text
With recent update in u-boot gitattributes all files are treated as regular text files. This creates problems with special files and repo always shows uncommitted files like below. Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: tools/logos/compulab.bmp modified: tools/logos/denx-comp.bmp modified: tools/logos/toradex.bmp To fix above problem special files bmp/ttf files are treated as binary files in the gitattributes. Signed-off-by: Vignesh Rajendran <vignesh.rajendran@in.bosch.com> Signed-off-by: Veeraiyan Chidambaram <veeraiyan.chidambaram@in.bosch.com>
-rw-r--r--.gitattributes3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 8560b794c0..899473ab0f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
# Declare files that always have LF line endings on checkout
* text eol=lf
+# Denote all files that are truly binary and should not be modified
+*.bmp binary
+*.ttf binary