From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 20 Jan 2014 18:00:39 -0500 Subject: [U-Boot] [U-Boot, v2, 1/4] spl: common: Properly ignore spl/Makefile in .gitignore In-Reply-To: <1389893011-1879-1-git-send-email-dmurphy@ti.com> References: <1389893011-1879-1-git-send-email-dmurphy@ti.com> Message-ID: <20140120230039.GL3277@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, Jan 16, 2014 at 11:23:28AM -0600, Dan Murphy wrote: > 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 Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: