From: Ralph Siemsen Date: Thu, 1 May 2014 18:18:41 +0000 (-0400) Subject: Trivial fix to .gitignore for spl/Makefile X-Git-Tag: v2014.07-rc2~32 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7e18a1b9586e4d992f49bcd0728a93f8828b9f98;p=u-boot Trivial fix to .gitignore for spl/Makefile Trivial fix to .gitignore for spl/Makefile According to the gitignore man page: "An optional prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again." ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ So the directory exclude "/spl/*" must come before the exception for spl/Makefile otherwise it has no effect. Signed-off-by: Ralph Siemsen Tested-by: Masahiro Yamada [on git v1.7.9.5 / v1.8.3.2] --- diff --git a/.gitignore b/.gitignore index cba5eac2a0..a6b2d1c650 100644 --- a/.gitignore +++ b/.gitignore @@ -47,8 +47,8 @@ /errlog /reloc_off -!/spl/Makefile /spl/* +!/spl/Makefile /tpl/ #