From: Dan Murphy Date: Thu, 16 Jan 2014 17:23:28 +0000 (-0600) Subject: spl: common: Properly ignore spl/Makefile in .gitignore X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=86a8b3a207ac34f453607a52a4d702bb67789ea2;p=u-boot.git spl: common: Properly ignore spl/Makefile in .gitignore The spl directory is ignored by git as these objects are created during spl creation. The only file not created is the Makefile. This file can be modified and checked in via git. Due to the order of rule precedence having the whole directory ignored first then indicating not to ignore the Makefile is not correct the message to force adding the Makefile is still shown. So reorder the .gitignore for the Makefile and indicate that the Makefile does not need to be ignored first and then indicate everything else in spl should be ignored after wards. Signed-off-by: Dan Murphy --- diff --git a/.gitignore b/.gitignore index 97f7db069a..d7d55383ac 100644 --- a/.gitignore +++ b/.gitignore @@ -58,8 +58,8 @@ /errlog /reloc_off -/spl/ !/spl/Makefile +/spl/* /tpl/ /include/generated/