From d6da4da3beba40f0c8b54d8f70c627da4d001d94 Mon Sep 17 00:00:00 2001 From: Vignesh Rajendran Date: Fri, 8 Nov 2019 16:32:55 +0100 Subject: [PATCH] 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 ..." to update what will be committed) (use "git checkout -- ..." 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 Signed-off-by: Veeraiyan Chidambaram --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) 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 -- 2.25.1